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

[windowManager] Really fix state checking for workspace switcher popup

Browse Source 
To be correct just always check at time of use whether the overview
is visible, rather than trying to use whether or not it was
constructed earlier.
This commit is contained in:
Colin Walters 2010-03-18 14:53:58 -04:00
parent 6c13ca817d
commit e21aea6e13
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/ui/windowManager.js
View File

@ -315,7 +315,7 @@ WindowManager.prototype = {
if (global.screen.n_workspaces == 1)
return;
if (this._workspaceSwitcherPopup == null && !Main.overview.visible)
if (this._workspaceSwitcherPopup == null)
this._workspaceSwitcherPopup = new WorkspaceSwitcherPopup.WorkspaceSwitcherPopup();
if (binding == "switch_to_workspace_left") {
@ -331,9 +331,9 @@ WindowManager.prototype = {
let activeWorkspaceIndex = global.screen.get_active_workspace_index();
if (activeWorkspaceIndex > 0) {
global.screen.get_workspace_by_index(activeWorkspaceIndex - 1).activate(global.get_current_time());
if (this._workspaceSwitcherPopup != null)
if (!Main.overview.visible)
this._workspaceSwitcherPopup.display(WorkspaceSwitcherPopup.LEFT, activeWorkspaceIndex - 1);
} else if (this._workspaceSwitcherPopup != null){
} else if (!Main.overview.visible) {
this._workspaceSwitcherPopup.display(WorkspaceSwitcherPopup.LEFT, activeWorkspaceIndex);
}
},
@ -342,9 +342,9 @@ WindowManager.prototype = {
let activeWorkspaceIndex = global.screen.get_active_workspace_index();
if (activeWorkspaceIndex < global.screen.n_workspaces - 1) {
global.screen.get_workspace_by_index(activeWorkspaceIndex + 1).activate(global.get_current_time());
if (this._workspaceSwitcherPopup != null)
if (!Main.overview.visible)
this._workspaceSwitcherPopup.display(WorkspaceSwitcherPopup.RIGHT, activeWorkspaceIndex + 1);
} else if (this._workspaceSwitcherPopup != null) {
} else if (!Main.overview.visible) {
this._workspaceSwitcherPopup.display(WorkspaceSwitcherPopup.RIGHT, activeWorkspaceIndex);
}
}