dany/clapper
1
0
Fork 0
mirror of https://github.com/Rafostar/clapper.git synced 2025-08-29 23:32:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Readapt to changed monitor on the fly

Browse Source 
Check and apply/remove TV mode UI on the fly when switching monitors.
This allows for e.g. having a mobile device connected to external big screen,
drag Clapper window from one screen to another and UI should automatically
adapt between mobile and TV modes without interrupting playback.

This also helps in situations where monitor size is not initially known
on window map #74.
This commit is contained in:
Rafał Dzięgiel
2021-05-12 15:31:09 +02:00
parent 2f5d6d60ed
commit af0e082c43
2 changed files with 81 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
src/widget.js
View File

@@ -38,6 +38,7 @@ class ClapperWidget extends Gtk.Grid
this._hideControlsTimeout = null;
this._updateTimeTimeout = null;
this.surfaceMapSignal = null;
this.needsCursorRestore = false;
@@ -145,9 +146,6 @@ class ClapperWidget extends Gtk.Grid
const action = (isFullscreen) ? 'add' : 'remove';
root[action + '_css_class']('gpufriendlyfs');
if(!this.isMobileMonitor)
root[action + '_css_class']('tvmode');
if(!isFullscreen)
this._clearTimeout('updateTime');
@@ -538,30 +536,70 @@ class ClapperWidget extends Gtk.Grid
_onWindowMap(window)
{
const surface = window.get_surface();
const monitor = window.display.get_monitor_at_surface(surface);
const geometry = monitor.geometry;
const size = JSON.parse(settings.get_string('window-size'));
debug(`monitor application-pixels: ${geometry.width}x${geometry.height}`);
if(geometry.width >= size[0] && geometry.height >= size[1]) {
window.set_default_size(size[0], size[1]);
debug(`restored window size: ${size[0]}x${size[1]}`);
}
const monitorWidth = Math.max(geometry.width, geometry.height);
if(monitorWidth < 1280) {
this.isMobileMonitor = true;
debug('mobile monitor detected');
}
if(!surface.mapped)
this.surfaceMapSignal = surface.connect(
'notify::mapped', this._onSurfaceMapNotify.bind(this)
);
else
this._onSurfaceMapNotify(surface);
surface.connect('notify::state', this._onStateNotify.bind(this));
surface.connect('enter-monitor', this._onEnterMonitor.bind(this));
surface.connect('layout', this._onLayoutUpdate.bind(this));
this.player._onWindowMap(window);
}
_onSurfaceMapNotify(surface)
{
if(!surface.mapped)
return;
if(this.surfaceMapSignal) {
surface.disconnect(this.surfaceMapSignal);
this.surfaceMapSignal = null;
}
const monitor = surface.display.get_monitor_at_surface(surface);
const size = JSON.parse(settings.get_string('window-size'));
const hasMonitor = Boolean(monitor && monitor.geometry);
/* Let GTK handle window restore if no monitor, otherwise
check if its size is greater then saved window size */
if(
!hasMonitor
|| (monitor.geometry.width >= size[0]
&& monitor.geometry.height >= size[1])
) {
if(!hasMonitor)
debug('restoring window size without monitor geometry');
this.root.set_default_size(size[0], size[1]);
debug(`restored window size: ${size[0]}x${size[1]}`);
}
}
_onEnterMonitor(surface, monitor)
{
debug('entered new monitor');
const { geometry } = monitor;
debug(`monitor application-pixels: ${geometry.width}x${geometry.height}`);
const monitorWidth = Math.max(geometry.width, geometry.height);
this.isMobileMonitor = (monitorWidth < 1280);
debug(`mobile monitor detected: ${this.isMobileMonitor}`);
const hasTVCss = this.root.has_css_class('tvmode');
if(hasTVCss === this.isMobileMonitor) {
const action = (this.isMobileMonitor) ? 'remove' : 'add';
this.root[action + '_css_class']('tvmode');
}
/* Update top revealer display mode */
this.revealerTop.setFullscreenMode(this.isFullscreenMode, this.isMobileMonitor);
}
_clearTimeout(name)
{
if(!this[`_${name}Timeout`])
@@ -611,6 +649,7 @@ class ClapperWidget extends Gtk.Grid
&& !this.isMobileMonitor
&& !this._updateTimeTimeout
) {
debug('setting update time interval');
this._setUpdateTimeInterval();
}
}