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

boxPointer: Rename show/hide to open/close

Browse Source 
Pretty much like dd4709bb2, BoxPointer's show() and hide()
functions will clash with Clutter.Actor's ones.

In addition to that, on a conceptual level, the current API
is not great, because calling boxPointer.hide() won't result
in boxPointer.actor.visible == false.

For these reasons, rename show() and hide() to open() and
close(). A compatibility layer will be added in a following
commit, warning about the usage of show() and hide().

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/153
This commit is contained in:
Georges Basile Stavracas Neto 2018-08-21 07:29:44 -03:00
parent 0c0d76f7d6
commit 8b215b2446
No known key found for this signature in database
GPG Key ID: 886C17EE170D1385
6 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/ui/appDisplay.js
View File

@ -1535,7 +1535,7 @@ var AppFolderPopup = new Lang.Class({
// is completed so we can animate the icons after as we like without // is completed so we can animate the icons after as we like without
// showing them while boxpointer is animating. // showing them while boxpointer is animating.
this._view.actor.opacity = 0; this._view.actor.opacity = 0;
this._boxPointer.show(BoxPointer.PopupAnimation.FADE | this._boxPointer.open(BoxPointer.PopupAnimation.FADE |
BoxPointer.PopupAnimation.SLIDE, BoxPointer.PopupAnimation.SLIDE,
() => { () => {
this._view.actor.opacity = 255; this._view.actor.opacity = 255;
@ -1551,7 +1551,7 @@ var AppFolderPopup = new Lang.Class({
this._grabHelper.ungrab({ actor: this.actor }); this._grabHelper.ungrab({ actor: this.actor });
this._boxPointer.hide(BoxPointer.PopupAnimation.FADE | this._boxPointer.close(BoxPointer.PopupAnimation.FADE |
BoxPointer.PopupAnimation.SLIDE); BoxPointer.PopupAnimation.SLIDE);
this._isOpen = false; this._isOpen = false;
this.emit('open-state-changed', false); this.emit('open-state-changed', false);

4
js/ui/boxpointer.js
View File

@ -80,7 +80,7 @@ var BoxPointer = new Lang.Class({
} }
}, },
show(animate, onComplete) { open(animate, onComplete) {
let themeNode = this.actor.get_theme_node(); let themeNode = this.actor.get_theme_node();
let rise = themeNode.get_length('-arrow-rise'); let rise = themeNode.get_length('-arrow-rise');
let animationTime = (animate & PopupAnimation.FULL) ? POPUP_ANIMATION_TIME : 0; let animationTime = (animate & PopupAnimation.FULL) ? POPUP_ANIMATION_TIME : 0;
@ -121,7 +121,7 @@ var BoxPointer = new Lang.Class({
time: animationTime }); time: animationTime });
}, },
hide(animate, onComplete) { close(animate, onComplete) {
if (!this.actor.visible) if (!this.actor.visible)
return; return;

6
js/ui/ibusCandidatePopup.js
View File

@ -272,7 +272,7 @@ var CandidatePopup = new Lang.Class({
this._updateVisibility(); this._updateVisibility();
}); });
panelService.connect('focus-out', ps => { panelService.connect('focus-out', ps => {
this._boxPointer.hide(BoxPointer.PopupAnimation.NONE); this._boxPointer.close(BoxPointer.PopupAnimation.NONE);
Main.keyboard.resetSuggestions(); Main.keyboard.resetSuggestions();
}); });
}, },
@ -291,10 +291,10 @@ var CandidatePopup = new Lang.Class({
if (isVisible) { if (isVisible) {
this._boxPointer.setPosition(Main.layoutManager.dummyCursor, 0); this._boxPointer.setPosition(Main.layoutManager.dummyCursor, 0);
this._boxPointer.show(BoxPointer.PopupAnimation.NONE); this._boxPointer.open(BoxPointer.PopupAnimation.NONE);
this._boxPointer.actor.raise_top(); this._boxPointer.actor.raise_top();
} else { } else {
this._boxPointer.hide(BoxPointer.PopupAnimation.NONE); this._boxPointer.close(BoxPointer.PopupAnimation.NONE);
} }
}, },

4
js/ui/keyboard.js
View File

@ -356,7 +356,7 @@ var Key = new Lang.Class({
}, },
_showSubkeys() { _showSubkeys() {
this._boxPointer.show(BoxPointer.PopupAnimation.FULL); this._boxPointer.open(BoxPointer.PopupAnimation.FULL);
this._capturedEventId = global.stage.connect('captured-event', this._capturedEventId = global.stage.connect('captured-event',
this._onCapturedEvent.bind(this)); this._onCapturedEvent.bind(this));
this._unmapId = this.keyButton.connect('notify::mapped', () => { this._unmapId = this.keyButton.connect('notify::mapped', () => {
@ -367,7 +367,7 @@ var Key = new Lang.Class({
_hideSubkeys() { _hideSubkeys() {
if (this._boxPointer) if (this._boxPointer)
this._boxPointer.hide(BoxPointer.PopupAnimation.FULL); this._boxPointer.close(BoxPointer.PopupAnimation.FULL);
if (this._capturedEventId) { if (this._capturedEventId) {
global.stage.disconnect(this._capturedEventId); global.stage.disconnect(this._capturedEventId);
this._capturedEventId = 0; this._capturedEventId = 0;

4
js/ui/popupMenu.js
View File

@ -873,7 +873,7 @@ var PopupMenu = new Lang.Class({
this.isOpen = true; this.isOpen = true;
this._boxPointer.setPosition(this.sourceActor, this._arrowAlignment); this._boxPointer.setPosition(this.sourceActor, this._arrowAlignment);
this._boxPointer.show(animate); this._boxPointer.open(animate);
this.actor.raise_top(); this.actor.raise_top();
@ -885,7 +885,7 @@ var PopupMenu = new Lang.Class({
this._activeMenuItem.setActive(false); this._activeMenuItem.setActive(false);
if (this._boxPointer.actor.visible) { if (this._boxPointer.actor.visible) {
this._boxPointer.hide(animate, () => { this._boxPointer.close(animate, () => {
this.emit('menu-closed'); this.emit('menu-closed');
}); });
} }

2
js/ui/workspaceThumbnail.js
View File

@ -1142,8 +1142,6 @@ var ThumbnailsBox = new Lang.Class({
let workspaceManager = global.workspace_manager; let workspaceManager = global.workspace_manager;
let themeNode = this.get_theme_node(); let themeNode = this.get_theme_node();
forWidth = themeNode.adjust_for_width(forWidth);
let spacing = themeNode.get_length('spacing'); let spacing = themeNode.get_length('spacing');
let nWorkspaces = workspaceManager.n_workspaces; let nWorkspaces = workspaceManager.n_workspaces;
let totalSpacing = (nWorkspaces - 1) * spacing; let totalSpacing = (nWorkspaces - 1) * spacing;