From 2103ff6a5c62cae7bb82da4ad3f41fbeb7c088c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Mon, 24 Jun 2013 20:12:07 +0200 Subject: [PATCH] window: Don't force attached dialogs to be border-only Originally attached dialogs did not have a titlebar, which the code still assumes though it hasn't been true for a while; nowadays, the actual look of attached dialogs is controlled by the theme. As GTK+ recently gained the ability to set custom titlebars, we need to support attached dialogs with either full borders (WM decorations) or border-only (GTK+ titlebar). Just remove the left-over assumption to make it work as expected. https://bugzilla.gnome.org/show_bug.cgi?id=702764 --- src/core/window.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/core/window.c b/src/core/window.c index 66e37e126..9252ab22d 100644 --- a/src/core/window.c +++ b/src/core/window.c @@ -8251,9 +8251,6 @@ recalc_window_features (MetaWindow *window) if (window->type == META_WINDOW_TOOLBAR) window->decorated = FALSE; - if (meta_window_is_attached_dialog (window)) - window->border_only = TRUE; - if (window->type == META_WINDOW_DESKTOP || window->type == META_WINDOW_DOCK || window->override_redirect) @@ -10986,7 +10983,7 @@ meta_window_get_frame_type (MetaWindow *window) /* can't add border if undecorated */ return META_FRAME_TYPE_LAST; } - else if ((window->border_only && base_type != META_FRAME_TYPE_ATTACHED) || + else if (window->border_only || (window->hide_titlebar_when_maximized && META_WINDOW_MAXIMIZED (window)) || (window->hide_titlebar_when_maximized && META_WINDOW_TILED_SIDE_BY_SIDE (window))) {