From c9c3f858e28edf0856a263941007401923adbabd Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Sat, 27 Sep 2014 17:06:36 +0300 Subject: Add frame type for attached modal dialogs Add a new frame type META_FRAME_TYPE_ATTACHED which is used for attached modal dialogs. The theme format version is bumped to 3.2, and attached windows can have borders defined in a metacity-theme-3.xml as: If no style is defined for "attached", drawing will fall back to the "border" type. https://bugzilla.gnome.org/show_bug.cgi?id=592382 NOTE: Patch copied from mutter and adapted for metacity. --- src/core/core.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/core') diff --git a/src/core/core.c b/src/core/core.c index 4ba62db7..535a3820 100644 --- a/src/core/core.c +++ b/src/core/core.c @@ -131,7 +131,11 @@ meta_core_get (Display *xdisplay, break; case META_WINDOW_MODAL_DIALOG: - base_type = META_FRAME_TYPE_MODAL_DIALOG; + if (meta_prefs_get_attach_modal_dialogs () && + meta_window_get_transient_for (window) != NULL) + base_type = META_FRAME_TYPE_ATTACHED; + else + base_type = META_FRAME_TYPE_MODAL_DIALOG; break; case META_WINDOW_MENU: @@ -157,7 +161,7 @@ meta_core_get (Display *xdisplay, /* can't add border if undecorated */ *((MetaFrameType*)answer) = META_FRAME_TYPE_LAST; } - else if (window->border_only) + else if (window->border_only && base_type != META_FRAME_TYPE_ATTACHED) { /* override base frame type */ *((MetaFrameType*)answer) = META_FRAME_TYPE_BORDER; -- cgit v1.2.1