diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2022-01-12 02:48:10 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2022-01-12 02:48:10 +0000 |
| commit | 93ff65c685c0f512270718a4990a01ef8872485e (patch) | |
| tree | 3d638a0de23acc590f9eaa4fb576b25b9b613854 | |
| parent | 7e7201745dd37127f2b8a47473bc0a5d798343b1 (diff) | |
| parent | 25ec20d8618afb6a6d1bf4ecfc263d44a9498d46 (diff) | |
| download | gtk+-93ff65c685c0f512270718a4990a01ef8872485e.tar.gz | |
Merge branch 'should_be_mapped' into 'main'
gdk/wayland/surface: Remove redundant `should_be_mapped` code
See merge request GNOME/gtk!4203
| -rw-r--r-- | gdk/wayland/gdksurface-wayland.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/gdk/wayland/gdksurface-wayland.c b/gdk/wayland/gdksurface-wayland.c index 3c046b5ea2..93498d7cb5 100644 --- a/gdk/wayland/gdksurface-wayland.c +++ b/gdk/wayland/gdksurface-wayland.c @@ -118,7 +118,6 @@ struct _GdkWaylandSurface unsigned int mapped : 1; unsigned int awaiting_frame : 1; unsigned int awaiting_frame_frozen : 1; - unsigned int is_drag_surface : 1; int pending_buffer_offset_x; int pending_buffer_offset_y; @@ -2836,27 +2835,12 @@ find_grab_input_seat (GdkSurface *surface, return NULL; } -static gboolean -should_be_mapped (GdkSurface *surface) -{ - GdkWaylandSurface *impl = GDK_WAYLAND_SURFACE (surface); - - /* Don't map crazy temp that GTK uses for internal X11 shenanigans. */ - if (GDK_IS_DRAG_SURFACE (surface) && surface->x < 0 && surface->y < 0) - return FALSE; - - if (impl->is_drag_surface) - return FALSE; - - return TRUE; -} - static void gdk_wayland_surface_map_toplevel (GdkSurface *surface) { GdkWaylandSurface *impl = GDK_WAYLAND_SURFACE (surface); - if (!should_be_mapped (surface)) + if (!GDK_IS_WAYLAND_TOPLEVEL (surface)) return; if (impl->mapped) @@ -4714,7 +4698,6 @@ create_dnd_surface (GdkDisplay *display) GDK_SURFACE_TEMP, NULL, 0, 0, 100, 100); - GDK_WAYLAND_SURFACE (surface)->is_drag_surface = TRUE; return surface; } |