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

core: Drop MetaGravity argument from move_resize_internal() call

Browse Source 
Obtain the gravity through the newly added MetaWindow method from the
window being moved/resized.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3972>
This commit is contained in:
Carlos Garnacho 2024-07-16 13:56:40 +02:00 committed by Marge Bot
parent 432e52bad0
commit fb49a700a1
5 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/core/window-private.h
View File

@ -795,7 +795,6 @@ void meta_window_set_urgent (MetaWindow *window,
void meta_window_move_resize_internal (MetaWindow *window, void meta_window_move_resize_internal (MetaWindow *window,
MetaMoveResizeFlags flags, MetaMoveResizeFlags flags,
MetaPlaceFlag place_flags, MetaPlaceFlag place_flags,
MetaGravity gravity,
MtkRectangle frame_rect); MtkRectangle frame_rect);
void meta_window_move_resize (MetaWindow *window, void meta_window_move_resize (MetaWindow *window,

7
src/core/window.c
View File

@ -2176,7 +2176,6 @@ meta_window_force_placement (MetaWindow *window,
meta_window_move_resize_internal (window, meta_window_move_resize_internal (window,
flags, flags,
place_flags, place_flags,
META_GRAVITY_NORTH_WEST,
window->unconstrained_rect); window->unconstrained_rect);
window->calc_placement = FALSE; window->calc_placement = FALSE;
@ -3977,7 +3976,6 @@ void
meta_window_move_resize_internal (MetaWindow *window, meta_window_move_resize_internal (MetaWindow *window,
MetaMoveResizeFlags flags, MetaMoveResizeFlags flags,
MetaPlaceFlag place_flags, MetaPlaceFlag place_flags,
MetaGravity gravity,
MtkRectangle frame_rect) MtkRectangle frame_rect)
{ {
/* The rectangle here that's passed in *always* in "frame rect" /* The rectangle here that's passed in *always* in "frame rect"
@ -4010,6 +4008,7 @@ meta_window_move_resize_internal (MetaWindow *window,
MetaMoveResizeResultFlags result = 0; MetaMoveResizeResultFlags result = 0;
gboolean moved_or_resized = FALSE; gboolean moved_or_resized = FALSE;
MetaWindowUpdateMonitorFlags update_monitor_flags; MetaWindowUpdateMonitorFlags update_monitor_flags;
MetaGravity gravity;
g_return_if_fail (!window->override_redirect); g_return_if_fail (!window->override_redirect);
@ -4022,6 +4021,8 @@ meta_window_move_resize_internal (MetaWindow *window,
did_placement = !window->placed && window->calc_placement; did_placement = !window->placed && window->calc_placement;
gravity = meta_window_get_gravity (window);
/* We don't need it in the idle queue anymore. */ /* We don't need it in the idle queue anymore. */
meta_window_unqueue (window, META_QUEUE_MOVE_RESIZE); meta_window_unqueue (window, META_QUEUE_MOVE_RESIZE);
rect = meta_window_config_get_rect (window->config); rect = meta_window_config_get_rect (window->config);
@ -4187,7 +4188,6 @@ meta_window_move_resize (MetaWindow *window,
meta_window_move_resize_internal (window, meta_window_move_resize_internal (window,
flags, flags,
META_PLACE_FLAG_NONE, META_PLACE_FLAG_NONE,
META_GRAVITY_NORTH_WEST,
rect); rect);
} }
@ -4433,7 +4433,6 @@ meta_window_resize_frame_with_gravity (MetaWindow *window,
meta_window_move_resize_internal (window, meta_window_move_resize_internal (window,
flags, flags,
META_PLACE_FLAG_NONE, META_PLACE_FLAG_NONE,
gravity,
rect); rect);
} }

1
src/wayland/meta-wayland-xdg-session-state.c
View File

@ -431,7 +431,6 @@ meta_wayland_xdg_session_state_restore_window (MetaSessionState *state,
META_MOVE_RESIZE_MOVE_ACTION | META_MOVE_RESIZE_MOVE_ACTION |
META_MOVE_RESIZE_RESIZE_ACTION), META_MOVE_RESIZE_RESIZE_ACTION),
META_PLACE_FLAG_NONE, META_PLACE_FLAG_NONE,
META_GRAVITY_NORTH_WEST,
*rect); *rect);
} }

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

@ -1207,7 +1207,6 @@ meta_window_wayland_finish_move_resize (MetaWindow *window,
MetaWaylandSurface *surface = wl_window->surface; MetaWaylandSurface *surface = wl_window->surface;
int dx, dy; int dx, dy;
int geometry_scale; int geometry_scale;
MetaGravity gravity;
MtkRectangle rect; MtkRectangle rect;
MetaMoveResizeFlags flags; MetaMoveResizeFlags flags;
MetaWaylandWindowConfiguration *acked_configuration; MetaWaylandWindowConfiguration *acked_configuration;
@ -1336,16 +1335,9 @@ meta_window_wayland_finish_move_resize (MetaWindow *window,
meta_wayland_window_configuration_free); meta_wayland_window_configuration_free);
wl_window->last_acked_configuration = g_steal_pointer (&acked_configuration); wl_window->last_acked_configuration = g_steal_pointer (&acked_configuration);
if (window_drag && /* Force unconstrained move when running toplevel drags */
meta_window_drag_get_window (window_drag) == window)
gravity = meta_resize_gravity_from_grab_op (meta_window_drag_get_grab_op (window_drag));
else
gravity = META_GRAVITY_STATIC;
/* Force unconstrained move + northwest gravity when running toplevel drags */
if (toplevel_drag && surface == toplevel_drag->dragged_surface) if (toplevel_drag && surface == toplevel_drag->dragged_surface)
{ {
gravity = META_GRAVITY_NORTH_WEST;
window_actor = meta_window_actor_from_window (window); window_actor = meta_window_actor_from_window (window);
meta_window_actor_set_tied_to_drag (window_actor, TRUE); meta_window_actor_set_tied_to_drag (window_actor, TRUE);
} }
@ -1353,7 +1345,6 @@ meta_window_wayland_finish_move_resize (MetaWindow *window,
meta_window_move_resize_internal (window, meta_window_move_resize_internal (window,
flags, flags,
META_PLACE_FLAG_NONE, META_PLACE_FLAG_NONE,
gravity,
rect); rect);
} }

4
src/x11/window-x11.c
View File

@ -625,7 +625,6 @@ meta_window_apply_session_info (MetaWindow *window,
meta_window_move_resize_internal (window, meta_window_move_resize_internal (window,
flags, flags,
META_PLACE_FLAG_NONE, META_PLACE_FLAG_NONE,
gravity,
rect); rect);
} }
} }
@ -709,7 +708,6 @@ meta_window_x11_initialize_state (MetaWindow *window)
meta_window_move_resize_internal (window, meta_window_move_resize_internal (window,
flags, flags,
META_PLACE_FLAG_NONE, META_PLACE_FLAG_NONE,
gravity,
rect); rect);
} }
@ -3040,7 +3038,6 @@ meta_window_move_resize_request (MetaWindow *window,
meta_window_move_resize_internal (window, meta_window_move_resize_internal (window,
flags, flags,
META_PLACE_FLAG_NONE, META_PLACE_FLAG_NONE,
gravity,
rect); rect);
} }
} }
@ -5012,7 +5009,6 @@ meta_window_x11_configure (MetaWindow *window)
meta_window_move_resize_internal (window, meta_window_move_resize_internal (window,
flags, flags,
META_PLACE_FLAG_NONE, META_PLACE_FLAG_NONE,
window->size_hints.win_gravity,
new_rect); new_rect);
} }