Merged with lp:~niels-avonds/gala/gala-fix-1008188

This commit is contained in:
Tom Beckmann 2012-06-04 23:49:47 +02:00
commit ef0211d7a5

View File

@ -486,11 +486,16 @@ namespace Gala
switch_workspace_completed ();
var focus = get_next_window (screen.get_active_workspace ());
var focus = screen.get_display ().get_tab_current (Meta.TabList.NORMAL, screen, screen.get_active_workspace ());
// Only switch focus to the next window if none has grabbed it already
if (focus == null) {
focus = get_next_window (screen.get_active_workspace ());
if (focus != null)
focus.activate (screen.get_display ().get_current_time ());
}
}
public override void unmaximize (Meta.WindowActor actor, int ex, int ey, int ew, int eh)
{
if (actor.meta_window.window_type == WindowType.NORMAL) {