From 49400657caae2777c552c59a4bd98b7969982886 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Wed, 30 May 2012 13:57:04 +0200 Subject: stack: Ignore keep-on-top property on maximized windows It is impossible to switch to other windows when keep-on-top is set for maximized windows; given that keep-on-top is only ever useful to keep a window visible while focusing a different window, the current behavior is pointless. So ignore keep-on-top while a window is maximized. https://bugzilla.gnome.org/show_bug.cgi?id=673581 --- src/core/stack.c | 2 +- src/core/window.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/core/stack.c b/src/core/stack.c index 5127d2852..1d481f9cb 100644 --- a/src/core/stack.c +++ b/src/core/stack.c @@ -341,7 +341,7 @@ get_standalone_layer (MetaWindow *window) windows_on_different_monitor (window, window->display->expected_focus_window)))) layer = META_LAYER_FULLSCREEN; - else if (window->wm_state_above) + else if (window->wm_state_above && !META_WINDOW_MAXIMIZED (window)) layer = META_LAYER_TOP; else layer = META_LAYER_NORMAL; diff --git a/src/core/window.c b/src/core/window.c index d76c9fb5c..b0330246c 100644 --- a/src/core/window.c +++ b/src/core/window.c @@ -8326,7 +8326,8 @@ meta_window_show_menu (MetaWindow *window, if ((window->type == META_WINDOW_DESKTOP) || (window->type == META_WINDOW_DOCK) || - (window->type == META_WINDOW_SPLASHSCREEN)) + (window->type == META_WINDOW_SPLASHSCREEN || + META_WINDOW_MAXIMIZED (window))) insensitive |= META_MENU_OP_ABOVE | META_MENU_OP_UNABOVE; /* If all operations are disabled, just quit without showing the menu. -- cgit v1.2.1