isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-24 17:10:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

wayland/xdg-shell: Don't use xdg_surface private to get window geometry

Browse Source 
We already used the actual API in the same function, move that call a
bit higher up to and use the variable in more places.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1295

(cherry picked from commit 4c0aa2afca)
This commit is contained in:
Jonas Ådahl 2020-06-08 10:06:44 +02:00 committed by Robert Mader
parent 9b349cb25b
commit 36a6235f3a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/wayland/meta-wayland-xdg-shell.c
View File

@ -790,6 +790,8 @@ meta_wayland_xdg_toplevel_post_apply_state (MetaWaylandSurfaceRole *surface_rol
MetaWaylandSurfaceRoleClass *surface_role_class; MetaWaylandSurfaceRoleClass *surface_role_class;
MetaWindow *window; MetaWindow *window;
MetaRectangle old_geometry; MetaRectangle old_geometry;
MetaRectangle window_geometry;
gboolean geometry_changed; gboolean geometry_changed;
window = meta_wayland_surface_get_window (surface); window = meta_wayland_surface_get_window (surface);
@ -805,13 +807,11 @@ meta_wayland_xdg_toplevel_post_apply_state (MetaWaylandSurfaceRole *surface_rol
if (!pending->newly_attached) if (!pending->newly_attached)
return; return;
geometry_changed = !meta_rectangle_equal (&old_geometry, &xdg_surface_priv->geometry); window_geometry = meta_wayland_xdg_surface_get_window_geometry (xdg_surface);
geometry_changed = !meta_rectangle_equal (&old_geometry, &window_geometry);
if (geometry_changed || pending->has_acked_configure_serial) if (geometry_changed || pending->has_acked_configure_serial)
{ {
MetaRectangle window_geometry;
window_geometry = meta_wayland_xdg_surface_get_window_geometry (xdg_surface);
meta_window_wayland_finish_move_resize (window, window_geometry, pending); meta_window_wayland_finish_move_resize (window, window_geometry, pending);
} }
else if (pending->dx != 0 || pending->dy != 0) else if (pending->dx != 0 || pending->dy != 0)