isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-26 12:52:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

compositor: Undo MetaWindowDrag on MetaWindow::unmanaged signal

Browse Source 
The current usage of MetaWindow::unmanaging may result in confused
focus window lookups while undoing the MetaWindowDrag grab (i.e.
still pointing to the window that is now being unmanaged).

The meta_window_unmanage() function itself takes care of changing
focus outside of the window being unmanaged, so postpone the
MetaWindowDrag undoing to a point after that is done.

Fixes: https://gitlab.gnome.org/GNOME/mutter/-/issues/3073
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3376>
This commit is contained in:
Carlos Garnacho 2023-11-09 13:32:09 +01:00 committed by Marge Bot
parent 75d00027ca
commit 6ad0114d1f
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/compositor/meta-window-drag.c
View File

@ -71,7 +71,7 @@ struct _MetaWindowDrag {
/* if TRUE, window was maximized at start of current grab op */
gboolean shaken_loose;
gulong unmanaging_id;
gulong unmanaged_id;
gulong size_changed_id;
guint tile_preview_timeout_id;
@ -380,7 +380,7 @@ meta_window_drag_end (MetaWindowDrag *window_drag)
clutter_grab_dismiss (window_drag->grab);
g_clear_signal_handler (&window_drag->unmanaging_id, grab_window);
g_clear_signal_handler (&window_drag->unmanaged_id, grab_window);
g_clear_signal_handler (&window_drag->size_changed_id, grab_window);
meta_topic (META_DEBUG_WINDOW_OPS,
@ -400,8 +400,8 @@ meta_window_drag_end (MetaWindowDrag *window_drag)
}
static void
on_grab_window_unmanaging (MetaWindow *window,
MetaWindowDrag *window_drag)
on_grab_window_unmanaged (MetaWindow *window,
MetaWindowDrag *window_drag)
{
meta_window_drag_end (window_drag);
}
@ -1848,9 +1848,9 @@ meta_window_drag_begin (MetaWindowDrag *window_drag,
meta_window_ungrab_keys (grab_window);
g_set_object (&window_drag->effective_grab_window, grab_window);
window_drag->unmanaging_id =
g_signal_connect (grab_window, "unmanaging",
G_CALLBACK (on_grab_window_unmanaging), window_drag);
window_drag->unmanaged_id =
g_signal_connect (grab_window, "unmanaged",
G_CALLBACK (on_grab_window_unmanaged), window_drag);
window_drag->leading_device = device;
window_drag->leading_touch_sequence = sequence;