diff options
author | Matthias Clasen <mclasen@redhat.com> | 2019-03-23 00:14:46 -0400 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2019-03-26 19:18:39 -0400 |
commit | 36584b193d28b6c65354f055fef85f1e7e980895 (patch) | |
tree | eb86b3c35b7304ccf3b88b2620df1c55cd24b29f | |
parent | 19919365de195cc361d34cb2ca3f7bc9bb69ff95 (diff) | |
download | gtk+-36584b193d28b6c65354f055fef85f1e7e980895.tar.gz |
wayland: Stop using child surface apis
We no longer have child surfaces.
Drop code that only makes sense in their
presence.
-rw-r--r-- | gdk/wayland/gdkdevice-wayland.c | 4 | ||||
-rw-r--r-- | gdk/wayland/gdksurface-wayland.c | 26 |
2 files changed, 4 insertions, 26 deletions
diff --git a/gdk/wayland/gdkdevice-wayland.c b/gdk/wayland/gdkdevice-wayland.c index 70a7a996de..5b0467bf71 100644 --- a/gdk/wayland/gdkdevice-wayland.c +++ b/gdk/wayland/gdkdevice-wayland.c @@ -717,7 +717,7 @@ device_maybe_emit_grab_crossing (GdkDevice *device, guint32 time) { GdkSurface *native = gdk_wayland_device_get_focus (device); - GdkSurface *focus = gdk_surface_get_toplevel (window); + GdkSurface *focus = window; if (focus != native) device_emit_grab_crossing (device, focus, window, GDK_CROSSING_GRAB, time); @@ -4576,7 +4576,7 @@ gdk_wayland_seat_grab (GdkSeat *seat, GdkSurface *native; GList *l; - native = gdk_surface_get_toplevel (surface); + native = surface; if (native == NULL || GDK_SURFACE_DESTROYED (native)) return GDK_GRAB_NOT_VIEWABLE; diff --git a/gdk/wayland/gdksurface-wayland.c b/gdk/wayland/gdksurface-wayland.c index ae76c4313d..748109eca0 100644 --- a/gdk/wayland/gdksurface-wayland.c +++ b/gdk/wayland/gdksurface-wayland.c @@ -520,7 +520,6 @@ gdk_wayland_surface_update_scale (GdkSurface *surface) GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (gdk_surface_get_display (surface)); guint32 scale; GSList *l; - GList *children, *c; if (display_wayland->compositor_version < WL_SURFACE_HAS_BUFFER_SCALE) { @@ -537,14 +536,6 @@ gdk_wayland_surface_update_scale (GdkSurface *surface) /* Notify app that scale changed */ gdk_wayland_surface_maybe_configure (surface, surface->width, surface->height, scale); - - children = gdk_surface_get_children (surface); - for (c = children; c; c = c->next) - { - GdkSurface *child = c->data; - gdk_wayland_surface_update_scale (child); - } - g_list_free (children); } static void gdk_wayland_surface_create_surface (GdkSurface *surface); @@ -1708,19 +1699,6 @@ get_real_parent_and_translate (GdkSurface *surface, GdkSurfaceImplWayland *impl = GDK_SURFACE_IMPL_WAYLAND (surface->impl); GdkSurface *parent = impl->transient_for; - while (parent) - { - GdkSurface *effective_parent = gdk_surface_get_parent (parent); - - if (gdk_surface_has_native (parent) && !effective_parent) - break; - - *x += parent->x; - *y += parent->y; - - parent = effective_parent; - } - return parent; } @@ -2459,7 +2437,7 @@ gdk_wayland_surface_map (GdkSurface *surface) } if (transient_for) - transient_for = get_popup_parent (gdk_surface_get_toplevel (transient_for)); + transient_for = get_popup_parent (transient_for); /* If the position was not explicitly set, start the popup at the * position of the device that holds the grab. @@ -2470,7 +2448,7 @@ gdk_wayland_surface_map (GdkSurface *surface) } else { - transient_for = gdk_surface_get_toplevel (impl->transient_for); + transient_for = impl->transient_for; transient_for = get_popup_parent (transient_for); } |