callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wayland: look further through the hierarchy for the surface with the grab

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=693912
This commit is contained in:
Thomas Wood
2013-02-14 14:44:58 +00:00
committed by Cosimo Cecchi
parent 018a425562
commit ec43a1f72a
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gdk/wayland/gdkwindow-wayland.c
View File

@ -569,6 +569,7 @@ gdk_wayland_window_map (GdkWindow *window)
if (impl->transient_for)
{
struct wl_seat *grab_input_seat = NULL;
GdkWindowImplWayland *tmp_impl;
parent = GDK_WINDOW_IMPL_WAYLAND (impl->transient_for->impl);
@ -576,11 +577,18 @@ gdk_wayland_window_map (GdkWindow *window)
* the popup window setup - so this relies on GTK+ taking the
* grab before showing the popup window.
*/
if (impl->grab_input_seat)
grab_input_seat = impl->grab_input_seat;
grab_input_seat = impl->grab_input_seat;
if (!grab_input_seat)
grab_input_seat = parent->grab_input_seat;
tmp_impl = parent;
while (!grab_input_seat)
{
grab_input_seat = tmp_impl->grab_input_seat;
if (tmp_impl->transient_for)
tmp_impl = GDK_WINDOW_IMPL_WAYLAND (tmp_impl->transient_for->impl);
else
break;
}
if (grab_input_seat &&
(impl->hint == GDK_WINDOW_TYPE_HINT_POPUP_MENU ||