isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

workspace: Rename some variables for clarity

Browse Source 
Since the overlays we show on hover above the window clones are no
longer only a close button, but the window title, a border and a close
button, rename a few variables so it's easier to understand what they're
for.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/346
This commit is contained in:
verdre 2019-01-30 20:54:44 +01:00 committed by Florian Müllner
parent 193e4ae31e
commit a00b967df0
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
js/ui/workspace.js
View File

@ -23,7 +23,7 @@ var WINDOW_DND_SIZE = 256;
var WINDOW_CLONE_MAXIMUM_SCALE = 1.0; var WINDOW_CLONE_MAXIMUM_SCALE = 1.0;
var WINDOW_OVERLAY_IDLE_HIDE_TIMEOUT = 750; var WINDOW_OVERLAY_IDLE_HIDE_TIMEOUT = 750;
var CLOSE_BUTTON_FADE_TIME = 0.1; var WINDOW_OVERLAY_FADE_TIME = 0.1;
var WINDOW_REPOSITIONING_DELAY = 750; var WINDOW_REPOSITIONING_DELAY = 750;
@ -473,7 +473,7 @@ var WindowOverlay = class {
button.add_actor(new St.Icon({ icon_name: 'window-close-symbolic' })); button.add_actor(new St.Icon({ icon_name: 'window-close-symbolic' }));
button._overlap = 0; button._overlap = 0;
this._idleToggleCloseId = 0; this._idleHideOverlayId = 0;
button.connect('clicked', () => this._windowClone.deleteAll()); button.connect('clicked', () => this._windowClone.deleteAll());
windowClone.actor.connect('destroy', this._onDestroy.bind(this)); windowClone.actor.connect('destroy', this._onDestroy.bind(this));
@ -507,7 +507,7 @@ var WindowOverlay = class {
hide() { hide() {
this._hidden = true; this._hidden = true;
this.hideCloseButton(); this.hideOverlay();
} }
show() { show() {
@ -626,9 +626,9 @@ var WindowOverlay = class {
} }
_onDestroy() { _onDestroy() {
if (this._idleToggleCloseId > 0) { if (this._idleHideOverlayId > 0) {
Mainloop.source_remove(this._idleToggleCloseId); Mainloop.source_remove(this._idleHideOverlayId);
this._idleToggleCloseId = 0; this._idleHideOverlayId = 0;
} }
this._windowClone.metaWindow.disconnect(this._updateCaptionId); this._windowClone.metaWindow.disconnect(this._updateCaptionId);
this.title.destroy(); this.title.destroy();
@ -648,7 +648,7 @@ var WindowOverlay = class {
a.opacity = 0; a.opacity = 0;
Tweener.addTween(a, Tweener.addTween(a,
{ opacity: 255, { opacity: 255,
time: CLOSE_BUTTON_FADE_TIME, time: WINDOW_OVERLAY_FADE_TIME,
transition: 'easeOutQuad' }); transition: 'easeOutQuad' });
}); });
} }
@ -658,7 +658,7 @@ var WindowOverlay = class {
a.opacity = 255; a.opacity = 255;
Tweener.addTween(a, Tweener.addTween(a,
{ opacity: 0, { opacity: 0,
time: CLOSE_BUTTON_FADE_TIME, time: WINDOW_OVERLAY_FADE_TIME,
transition: 'easeInQuad' }); transition: 'easeInQuad' });
}); });
} }
@ -676,14 +676,14 @@ var WindowOverlay = class {
} }
_onHideChrome() { _onHideChrome() {
if (this._idleToggleCloseId == 0) { if (this._idleHideOverlayId == 0) {
this._idleToggleCloseId = Mainloop.timeout_add(WINDOW_OVERLAY_IDLE_HIDE_TIMEOUT, this._idleToggleCloseButton.bind(this)); this._idleHideOverlayId = Mainloop.timeout_add(WINDOW_OVERLAY_IDLE_HIDE_TIMEOUT, this._idleHideOverlay.bind(this));
GLib.Source.set_name_by_id(this._idleToggleCloseId, '[gnome-shell] this._idleToggleCloseButton'); GLib.Source.set_name_by_id(this._idleHideOverlayId, '[gnome-shell] this._idleHideOverlay');
} }
} }
_idleToggleCloseButton() { _idleHideOverlay() {
this._idleToggleCloseId = 0; this._idleHideOverlayId = 0;
if (!this._windowClone.actor['has-pointer'] && if (!this._windowClone.actor['has-pointer'] &&
!this.closeButton['has-pointer']) !this.closeButton['has-pointer'])
@ -692,10 +692,10 @@ var WindowOverlay = class {
return GLib.SOURCE_REMOVE; return GLib.SOURCE_REMOVE;
} }
hideCloseButton() { hideOverlay() {
if (this._idleToggleCloseId > 0) { if (this._idleHideOverlayId > 0) {
Mainloop.source_remove(this._idleToggleCloseId); Mainloop.source_remove(this._idleHideOverlayId);
this._idleToggleCloseId = 0; this._idleHideOverlayId = 0;
} }
this.closeButton.hide(); this.closeButton.hide();
this.border.hide(); this.border.hide();
@ -1892,7 +1892,7 @@ var Workspace = class {
let overlay = this._windowOverlays[i]; let overlay = this._windowOverlays[i];
if (overlay == windowOverlay) if (overlay == windowOverlay)
continue; continue;
overlay.hideCloseButton(); overlay.hideOverlay();
} }
} }