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

constraints: Use "orig" rectangle for interactive resize

Browse Source 
Bug 448183 fixed an issue with _NET_WM_MOVERESIZE_WINDOW not moving a
window by basing the resize on the current (new) rectangle instead of
the original rectangle.

While this fixes the issue with _NET_WM_MOVERESIZE_WINDOW, this also
causes windows with a size increment to move when the resize also
implies a move, such windows might drift while resizing.

Make sure to use the current rectangle for non-interactive resizes only.

Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/543
This commit is contained in:
Olivier Fourdan 2020-10-14 10:30:53 +02:00
parent deaa9480a8
commit 7ab3eac0e2
1 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/core/constraints.c
View File

@ -469,6 +469,16 @@ setup_constraint_info (ConstraintInfo *info,
info->entire_monitor.width, info->entire_monitor.height); info->entire_monitor.width, info->entire_monitor.height);
} }
static MetaRectangle *
get_start_rect_for_resize (MetaWindow *window,
ConstraintInfo *info)
{
if (!info->is_user_action && info->action_type == ACTION_MOVE_AND_RESIZE)
return &info->current;
else
return &info->orig;
}
static void static void
place_window_if_needed(MetaWindow *window, place_window_if_needed(MetaWindow *window,
ConstraintInfo *info) ConstraintInfo *info)
@ -1368,13 +1378,7 @@ constrain_size_increments (MetaWindow *window,
new_height = client_rect.height; new_height = client_rect.height;
} }
/* Figure out what original rect to pass to meta_rectangle_resize_with_gravity start_rect = get_start_rect_for_resize (window, info);
* See bug 448183
*/
if (info->action_type == ACTION_MOVE_AND_RESIZE)
start_rect = &info->current;
else
start_rect = &info->orig;
/* Resize to the new size */ /* Resize to the new size */
meta_rectangle_resize_with_gravity (start_rect, meta_rectangle_resize_with_gravity (start_rect,
@ -1424,13 +1428,7 @@ constrain_size_limits (MetaWindow *window,
new_width = CLAMP (info->current.width, min_size.width, max_size.width); new_width = CLAMP (info->current.width, min_size.width, max_size.width);
new_height = CLAMP (info->current.height, min_size.height, max_size.height); new_height = CLAMP (info->current.height, min_size.height, max_size.height);
/* Figure out what original rect to pass to meta_rectangle_resize_with_gravity start_rect = get_start_rect_for_resize (window, info);
* See bug 448183
*/
if (info->action_type == ACTION_MOVE_AND_RESIZE)
start_rect = &info->current;
else
start_rect = &info->orig;
meta_rectangle_resize_with_gravity (start_rect, meta_rectangle_resize_with_gravity (start_rect,
&info->current, &info->current,
@ -1570,13 +1568,7 @@ constrain_aspect_ratio (MetaWindow *window,
new_height = client_rect.height; new_height = client_rect.height;
} }
/* Figure out what original rect to pass to meta_rectangle_resize_with_gravity start_rect = get_start_rect_for_resize (window, info);
* See bug 448183
*/
if (info->action_type == ACTION_MOVE_AND_RESIZE)
start_rect = &info->current;
else
start_rect = &info->orig;
meta_rectangle_resize_with_gravity (start_rect, meta_rectangle_resize_with_gravity (start_rect,
&info->current, &info->current,