mirror of
https://github.com/brl/mutter.git
synced 2024-11-22 16:10:41 -05:00
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
This commit is contained in:
parent
8ab136b7ea
commit
2103ff6a5c
@ -8251,9 +8251,6 @@ recalc_window_features (MetaWindow *window)
|
|||||||
if (window->type == META_WINDOW_TOOLBAR)
|
if (window->type == META_WINDOW_TOOLBAR)
|
||||||
window->decorated = FALSE;
|
window->decorated = FALSE;
|
||||||
|
|
||||||
if (meta_window_is_attached_dialog (window))
|
|
||||||
window->border_only = TRUE;
|
|
||||||
|
|
||||||
if (window->type == META_WINDOW_DESKTOP ||
|
if (window->type == META_WINDOW_DESKTOP ||
|
||||||
window->type == META_WINDOW_DOCK ||
|
window->type == META_WINDOW_DOCK ||
|
||||||
window->override_redirect)
|
window->override_redirect)
|
||||||
@ -10986,7 +10983,7 @@ meta_window_get_frame_type (MetaWindow *window)
|
|||||||
/* can't add border if undecorated */
|
/* can't add border if undecorated */
|
||||||
return META_FRAME_TYPE_LAST;
|
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_MAXIMIZED (window)) ||
|
||||||
(window->hide_titlebar_when_maximized && META_WINDOW_TILED_SIDE_BY_SIDE (window)))
|
(window->hide_titlebar_when_maximized && META_WINDOW_TILED_SIDE_BY_SIDE (window)))
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user