diff options
Diffstat (limited to 'src/wayland/meta-wayland-xdg-shell.c')
| -rw-r--r-- | src/wayland/meta-wayland-xdg-shell.c | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/src/wayland/meta-wayland-xdg-shell.c b/src/wayland/meta-wayland-xdg-shell.c index a08520d31..41cdfc86b 100644 --- a/src/wayland/meta-wayland-xdg-shell.c +++ b/src/wayland/meta-wayland-xdg-shell.c @@ -608,17 +608,6 @@ is_new_size_hints_valid (MetaWindow *window, (new_max_height == 0 || new_min_height <= new_max_height)); } -static inline gboolean -did_geometry_change (MetaWaylandXdgSurface *xdg_surface, - MetaWaylandPendingState *pending) -{ - MetaWaylandXdgSurfacePrivate *priv = - meta_wayland_xdg_surface_get_instance_private (xdg_surface); - - return pending->has_new_geometry && - !meta_rectangle_equal (&priv->geometry, &pending->new_geometry); -} - static void meta_wayland_xdg_toplevel_commit (MetaWaylandSurfaceRole *surface_role, MetaWaylandPendingState *pending) @@ -632,6 +621,7 @@ meta_wayland_xdg_toplevel_commit (MetaWaylandSurfaceRole *surface_role, meta_wayland_surface_role_get_surface (surface_role); MetaWindow *window; MetaRectangle window_geometry; + MetaRectangle old_geometry; gboolean geometry_changed; if (!surface->buffer_ref.buffer && xdg_surface_priv->first_buffer_attached) @@ -641,10 +631,7 @@ meta_wayland_xdg_toplevel_commit (MetaWaylandSurfaceRole *surface_role, } window = surface->window; - - /* This check must happen before chaining up, otherwise the new geometry - * is applied and it'll always return FALSE. */ - geometry_changed = did_geometry_change (xdg_surface, pending); + old_geometry = xdg_surface_priv->geometry; surface_role_class = META_WAYLAND_SURFACE_ROLE_CLASS (meta_wayland_xdg_toplevel_parent_class); @@ -659,6 +646,8 @@ meta_wayland_xdg_toplevel_commit (MetaWaylandSurfaceRole *surface_role, if (!pending->newly_attached) return; + geometry_changed = !meta_rectangle_equal (&old_geometry, &xdg_surface_priv->geometry); + if (geometry_changed || meta_window_wayland_needs_move_resize (window)) { window_geometry = meta_wayland_xdg_surface_get_window_geometry (xdg_surface); |