elementary/gala
1
1
Fork 0
mirror of https://github.com/elementary/gala.git synced 2024-12-18 23:02:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed the problem when apps started from slingshot caused the current workspace to be removed

Browse Source
This commit is contained in:
Tom Beckmann 2012-06-13 15:23:30 +02:00
parent 77ab21d0dd
commit dfc28148df
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Main.vala
View File

@ -119,7 +119,7 @@ namespace Gala
Settings.get_default ().notify["enable-manager-corner"].connect (update_input_area); Settings.get_default ().notify["enable-manager-corner"].connect (update_input_area);
screen.get_workspaces ().foreach ((w) => { screen.get_workspaces ().foreach ((w) => {
w.window_removed.connect (() => check_workspaces (w)); w.window_removed.connect ((win) => {if (win.window_type != WindowType.MENU) check_workspaces (w);});
w.window_added.connect (() => check_workspaces (w)); w.window_added.connect (() => check_workspaces (w));
}); });
} }
@ -242,15 +242,18 @@ namespace Gala
/*FIXME using the MetaWindow to get the workspace directly did not work since they /*FIXME using the MetaWindow to get the workspace directly did not work since they
have already been destroyed when arriving here*/ have already been destroyed when arriving here*/
Timeout.add (500, () => {
var screen = get_screen (); var screen = get_screen ();
if (workspace.n_windows == 0 && moving == null) if (workspace.n_windows == 0 && moving == null)
screen.remove_workspace (workspace, screen.get_display ().get_current_time ()); screen.remove_workspace (workspace, screen.get_display ().get_current_time ());
if (screen.get_workspace_by_index (screen.n_workspaces-1).n_windows != 0) { if (screen.get_workspace_by_index (screen.n_workspaces-1).n_windows != 0) {
var new_w = screen.append_new_workspace (false, screen.get_display ().get_current_time ()); var new_w = screen.append_new_workspace (false, screen.get_display ().get_current_time ());
new_w.window_removed.connect (() => check_workspaces (new_w)); new_w.window_removed.connect ((w) => {if (w.window_type != WindowType.MENU) check_workspaces (new_w);});
new_w.window_added.connect (() => check_workspaces (new_w)); new_w.window_added.connect (() => check_workspaces (new_w));
} }
return false;
});
} }
public new void begin_modal () public new void begin_modal ()