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

Don't show the overview unless removing the workspace

Browse Source 
Don't enter the overview at startup, or when we we remove the
last window on the first workspace, but only when we remove a
workspace and there are windows on the other workspaces.

https://bugzilla.gnome.org/show_bug.cgi?id=644541
This commit is contained in:
Owen W. Taylor 2011-03-11 18:37:40 -05:00
parent 43a243b24a
commit 8a28022a6b
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js/ui/main.js
View File

@ -263,9 +263,13 @@ function _checkWorkspaces() {
} }
let activeWorkspaceIndex = global.screen.get_active_workspace_index(); let activeWorkspaceIndex = global.screen.get_active_workspace_index();
let currentWorkspaceEmpty = emptyWorkspaces[activeWorkspaceIndex]; let removingCurrentWorkspace = (emptyWorkspaces[activeWorkspaceIndex] &&
activeWorkspaceIndex < emptyWorkspaces.length - 1);
// Don't enter the overview when removing multiple empty workspaces at startup
let showOverview = (removingCurrentWorkspace &&
!emptyWorkspaces.every(function(x) { return x; }));
if (currentWorkspaceEmpty) { if (removingCurrentWorkspace) {
// "Merge" the empty workspace we are removing with the one at the end // "Merge" the empty workspace we are removing with the one at the end
wm.blockAnimations(); wm.blockAnimations();
} }
@ -276,11 +280,11 @@ function _checkWorkspaces() {
global.screen.remove_workspace(_workspaces[i], global.get_current_time()); global.screen.remove_workspace(_workspaces[i], global.get_current_time());
} }
if (currentWorkspaceEmpty) { if (removingCurrentWorkspace) {
global.screen.get_workspace_by_index(global.screen.n_workspaces - 1).activate(global.get_current_time()); global.screen.get_workspace_by_index(global.screen.n_workspaces - 1).activate(global.get_current_time());
wm.unblockAnimations(); wm.unblockAnimations();
if (!overview.visible) if (!overview.visible && showOverview)
overview.show(); overview.show();
} }