diff --git a/src/player.js b/src/player.js index 64dc2889..2ebb68d1 100644 --- a/src/player.js +++ b/src/player.js @@ -312,7 +312,7 @@ class ClapperPlayer extends PlayerBase const clapperWidget = this.widget.get_ancestor(Gtk.Grid); - return clapperWidget.fullscreenMode; + return clapperWidget.isFullscreenMode; } _setHideControlsTimeout() @@ -328,7 +328,7 @@ class ClapperPlayer extends PlayerBase this.widget.set_cursor(blankCursor); clapperWidget.revealerTop.set_cursor(blankCursor); - if(clapperWidget.fullscreenMode) + if(clapperWidget.isFullscreenMode) this._clearTimeout('updateTime'); clapperWidget.revealControls(false); @@ -351,7 +351,7 @@ class ClapperPlayer extends PlayerBase this._updateTimeTimeout = GLib.timeout_add(GLib.PRIORITY_DEFAULT, nextUpdate, () => { this._updateTimeTimeout = null; - if(clapperWidget.fullscreenMode) + if(clapperWidget.isFullscreenMode) this._setUpdateTimeInterval(); return GLib.SOURCE_REMOVE; @@ -377,7 +377,7 @@ class ClapperPlayer extends PlayerBase const clapperWidget = this.widget.get_ancestor(Gtk.Grid); - if(!clapperWidget.fullscreenMode && clapperWidget.controlsRevealer.child_revealed) { + if(!clapperWidget.isFullscreenMode && clapperWidget.controlsRevealer.child_revealed) { const size = window.get_default_size(); if(size[0] > 0 && size[1] > 0) { @@ -484,7 +484,7 @@ class ClapperPlayer extends PlayerBase if(settings.get_boolean('fullscreen-auto')) { const root = player.widget.get_root(); const clapperWidget = root.get_child(); - if(!clapperWidget.fullscreenMode) { + if(!clapperWidget.isFullscreenMode) { this.playOnFullscreen = true; root.fullscreen(); @@ -570,7 +570,7 @@ class ClapperPlayer extends PlayerBase this.toggle_play(); break; case Gdk.KEY_Return: - if(clapperWidget.fullscreenMode) { + if(clapperWidget.isFullscreenMode) { clapperWidget.revealControls(true); this._setHideControlsTimeout(); } @@ -589,7 +589,7 @@ class ClapperPlayer extends PlayerBase clapperWidget.toggleFullscreen(); break; case Gdk.KEY_Escape: - if(clapperWidget.fullscreenMode) { + if(clapperWidget.isFullscreenMode) { root = this.widget.get_root(); root.unfullscreen(); } @@ -661,7 +661,7 @@ class ClapperPlayer extends PlayerBase this._setHideControlsTimeout(); - if(clapperWidget.fullscreenMode) { + if(clapperWidget.isFullscreenMode) { if(!this._updateTimeTimeout) this._setUpdateTimeInterval(); } @@ -685,7 +685,7 @@ class ClapperPlayer extends PlayerBase return; const clapperWidget = this.widget.get_ancestor(Gtk.Grid); - if(clapperWidget.fullscreenMode) + if(clapperWidget.isFullscreenMode) return; const { gtk_double_click_distance } = this.widget.get_settings(); diff --git a/src/widget.js b/src/widget.js index 7f7cb536..23dcef7c 100644 --- a/src/widget.js +++ b/src/widget.js @@ -23,7 +23,7 @@ class ClapperWidget extends Gtk.Grid this.windowSize = JSON.parse(settings.get_string('window-size')); this.layoutWidth = 0; - this.fullscreenMode = false; + this.isFullscreenMode = false; this.isSeekable = false; this.isMobileMonitor = false; @@ -100,17 +100,17 @@ class ClapperWidget extends Gtk.Grid const root = this.get_root(); if(!root) return; - const un = (this.fullscreenMode) ? 'un' : ''; + const un = (this.isFullscreenMode) ? 'un' : ''; root[`${un}fullscreen`](); } setFullscreenMode(isFullscreen) { - if(this.fullscreenMode === isFullscreen) + if(this.isFullscreenMode === isFullscreen) return; debug('changing fullscreen mode'); - this.fullscreenMode = isFullscreen; + this.isFullscreenMode = isFullscreen; const root = this.get_root(); const action = (isFullscreen) ? 'add' : 'remove'; @@ -527,7 +527,7 @@ class ClapperWidget extends Gtk.Grid _onLeave(controller) { if( - this.fullscreenMode + this.isFullscreenMode || this.player.isWidgetDragging ) return;