brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

display: Fix the logic for moving attached dialogs

Browse Source 
If we have a tree of a window, a non-attached dialog, and then an
attached dialog, we want to move the second window, not the attached
dialog or the topmost. In other words, we want to move the first
non-attached window, or the first "freefloating window".

This happens in Firefox, whose Preferences dialog is freefloating,
but suboptions of those are modal dialogs.
This commit is contained in:
Jasper St. Pierre 2014-06-11 16:36:17 -04:00
parent 53814fefc1
commit 12fc394b92
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/core/display.c
View File

@ -1696,15 +1696,15 @@ meta_display_update_cursor (MetaDisplay *display)
} }
static MetaWindow * static MetaWindow *
get_toplevel_transient_for (MetaWindow *window) get_first_freefloating_window (MetaWindow *window)
{ {
while (TRUE) while (meta_window_is_attached_dialog (window))
{ window = meta_window_get_transient_for (window);
MetaWindow *parent = meta_window_get_transient_for (window);
if (parent == NULL) /* Attached dialogs should always have a non-NULL transient-for */
return window; g_assert (window != NULL);
window = parent;
} return window;
} }
gboolean gboolean
@ -1752,11 +1752,11 @@ meta_display_begin_grab_op (MetaDisplay *display,
grab_window = window; grab_window = window;
/* If window is a modal dialog attached to its parent, /* If we're trying to move a window, move the first
* grab the parent instead for moving. * non-attached dialog instead.
*/ */
if (meta_window_is_attached_dialog (window) && meta_grab_op_is_moving (op)) if (meta_grab_op_is_moving (op))
grab_window = get_toplevel_transient_for (window); grab_window = get_first_freefloating_window (window);
g_assert (grab_window != NULL); g_assert (grab_window != NULL);
g_assert (op != META_GRAB_OP_NONE); g_assert (op != META_GRAB_OP_NONE);