From fb49a700a1a75b9fa7f221467d91dc3e6473c767 Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Tue, 16 Jul 2024 13:56:40 +0200 Subject: [PATCH] core: Drop MetaGravity argument from move_resize_internal() call Obtain the gravity through the newly added MetaWindow method from the window being moved/resized. Part-of: --- src/core/window-private.h | 1 - src/core/window.c | 7 +++---- src/wayland/meta-wayland-xdg-session-state.c | 1 - src/wayland/meta-window-wayland.c | 11 +---------- src/x11/window-x11.c | 4 ---- 5 files changed, 4 insertions(+), 20 deletions(-) diff --git a/src/core/window-private.h b/src/core/window-private.h index 8f1af863b..4c0748e90 100644 --- a/src/core/window-private.h +++ b/src/core/window-private.h @@ -795,7 +795,6 @@ void meta_window_set_urgent (MetaWindow *window, void meta_window_move_resize_internal (MetaWindow *window, MetaMoveResizeFlags flags, MetaPlaceFlag place_flags, - MetaGravity gravity, MtkRectangle frame_rect); void meta_window_move_resize (MetaWindow *window, diff --git a/src/core/window.c b/src/core/window.c index 4c62238de..4e48f23e3 100644 --- a/src/core/window.c +++ b/src/core/window.c @@ -2176,7 +2176,6 @@ meta_window_force_placement (MetaWindow *window, meta_window_move_resize_internal (window, flags, place_flags, - META_GRAVITY_NORTH_WEST, window->unconstrained_rect); window->calc_placement = FALSE; @@ -3977,7 +3976,6 @@ void meta_window_move_resize_internal (MetaWindow *window, MetaMoveResizeFlags flags, MetaPlaceFlag place_flags, - MetaGravity gravity, MtkRectangle 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; gboolean moved_or_resized = FALSE; MetaWindowUpdateMonitorFlags update_monitor_flags; + MetaGravity gravity; 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; + gravity = meta_window_get_gravity (window); + /* We don't need it in the idle queue anymore. */ meta_window_unqueue (window, META_QUEUE_MOVE_RESIZE); rect = meta_window_config_get_rect (window->config); @@ -4187,7 +4188,6 @@ meta_window_move_resize (MetaWindow *window, meta_window_move_resize_internal (window, flags, META_PLACE_FLAG_NONE, - META_GRAVITY_NORTH_WEST, rect); } @@ -4433,7 +4433,6 @@ meta_window_resize_frame_with_gravity (MetaWindow *window, meta_window_move_resize_internal (window, flags, META_PLACE_FLAG_NONE, - gravity, rect); } diff --git a/src/wayland/meta-wayland-xdg-session-state.c b/src/wayland/meta-wayland-xdg-session-state.c index 69a6e250b..b10eda126 100644 --- a/src/wayland/meta-wayland-xdg-session-state.c +++ b/src/wayland/meta-wayland-xdg-session-state.c @@ -431,7 +431,6 @@ meta_wayland_xdg_session_state_restore_window (MetaSessionState *state, META_MOVE_RESIZE_MOVE_ACTION | META_MOVE_RESIZE_RESIZE_ACTION), META_PLACE_FLAG_NONE, - META_GRAVITY_NORTH_WEST, *rect); } diff --git a/src/wayland/meta-window-wayland.c b/src/wayland/meta-window-wayland.c index 194b95ca2..c27e614b9 100644 --- a/src/wayland/meta-window-wayland.c +++ b/src/wayland/meta-window-wayland.c @@ -1207,7 +1207,6 @@ meta_window_wayland_finish_move_resize (MetaWindow *window, MetaWaylandSurface *surface = wl_window->surface; int dx, dy; int geometry_scale; - MetaGravity gravity; MtkRectangle rect; MetaMoveResizeFlags flags; MetaWaylandWindowConfiguration *acked_configuration; @@ -1336,16 +1335,9 @@ meta_window_wayland_finish_move_resize (MetaWindow *window, meta_wayland_window_configuration_free); wl_window->last_acked_configuration = g_steal_pointer (&acked_configuration); - if (window_drag && - 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 */ + /* Force unconstrained move when running toplevel drags */ if (toplevel_drag && surface == toplevel_drag->dragged_surface) { - gravity = META_GRAVITY_NORTH_WEST; window_actor = meta_window_actor_from_window (window); 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, flags, META_PLACE_FLAG_NONE, - gravity, rect); } diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c index d30473f10..e214d5298 100644 --- a/src/x11/window-x11.c +++ b/src/x11/window-x11.c @@ -625,7 +625,6 @@ meta_window_apply_session_info (MetaWindow *window, meta_window_move_resize_internal (window, flags, META_PLACE_FLAG_NONE, - gravity, rect); } } @@ -709,7 +708,6 @@ meta_window_x11_initialize_state (MetaWindow *window) meta_window_move_resize_internal (window, flags, META_PLACE_FLAG_NONE, - gravity, rect); } @@ -3040,7 +3038,6 @@ meta_window_move_resize_request (MetaWindow *window, meta_window_move_resize_internal (window, flags, META_PLACE_FLAG_NONE, - gravity, rect); } } @@ -5012,7 +5009,6 @@ meta_window_x11_configure (MetaWindow *window) meta_window_move_resize_internal (window, flags, META_PLACE_FLAG_NONE, - window->size_hints.win_gravity, new_rect); }