From 1b58cd10a99bf71ab8946c5ed79ccf5874349001 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Sun, 18 Oct 2015 21:21:51 +0800 Subject: [PATCH] wayland: Map UTILITY hinted popup windows as subsurfaces Currently used by GtkTreeView to map windows without changing focus. We can't map this as a popup, because popup implies focus change. https://bugzilla.gnome.org/show_bug.cgi?id=756780 --- gdk/wayland/gdkwindow-wayland.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c index ce4c8fef9f..855516fc1d 100644 --- a/gdk/wayland/gdkwindow-wayland.c +++ b/gdk/wayland/gdkwindow-wayland.c @@ -1231,6 +1231,11 @@ should_map_as_subsurface (GdkWindow *window) case GDK_WINDOW_TYPE_HINT_TOOLTIP: return TRUE; + case GDK_WINDOW_TYPE_HINT_UTILITY: + if (gtk_window_get_window_type (window) == GTK_WINDOW_POPUP) + return TRUE; + break; + default: break; } @@ -1247,10 +1252,14 @@ should_map_as_popup (GdkWindow *window) { case GDK_WINDOW_TYPE_HINT_POPUP_MENU: case GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU: - case GDK_WINDOW_TYPE_HINT_UTILITY: case GDK_WINDOW_TYPE_HINT_COMBO: return TRUE; + case GDK_WINDOW_TYPE_HINT_UTILITY: + if (gtk_window_get_window_type (window) != GTK_WINDOW_POPUP) + return TRUE; + break; + default: break; }