brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "window/wayland: Use scale for configured rect in configuration"

Browse Source 
This caused https://gitlab.gnome.org/GNOME/mutter/-/issues/2616.

This reverts commit 2a62e690a21f98c22549d8a8c8a9b39916e1bc44.


(cherry picked from commit 2ea002c0df875b9bba18a8580b23e8f4ddfb042f)

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4041>
This commit is contained in:
Jonas Ådahl 2024-06-27 23:40:09 +02:00 committed by Marge Bot
parent 562beb9314
commit bce2790f7f
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/wayland/meta-window-wayland.c
View File

@ -1184,14 +1184,7 @@ meta_window_wayland_finish_move_resize (MetaWindow *window,
* scale new_geom to physical pixels given what buffer scale and texture scale * scale new_geom to physical pixels given what buffer scale and texture scale
* is in use. */ * is in use. */
acked_configuration = acquire_acked_configuration (wl_window, pending, geometry_scale = meta_window_wayland_get_geometry_scale (window);
&is_client_resize);
if (acked_configuration)
geometry_scale = acked_configuration->scale;
else
geometry_scale = meta_window_wayland_get_geometry_scale (window);
new_geom.x *= geometry_scale; new_geom.x *= geometry_scale;
new_geom.y *= geometry_scale; new_geom.y *= geometry_scale;
new_geom.width *= geometry_scale; new_geom.width *= geometry_scale;
@ -1221,6 +1214,9 @@ meta_window_wayland_finish_move_resize (MetaWindow *window,
flags = META_MOVE_RESIZE_WAYLAND_FINISH_MOVE_RESIZE; flags = META_MOVE_RESIZE_WAYLAND_FINISH_MOVE_RESIZE;
acked_configuration = acquire_acked_configuration (wl_window, pending,
&is_client_resize);
window_drag = meta_compositor_get_current_window_drag (display->compositor); window_drag = meta_compositor_get_current_window_drag (display->compositor);
/* x/y are ignored when we're doing interactive resizing */ /* x/y are ignored when we're doing interactive resizing */