isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-16 21:34:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

compositor: Pass MetaWindowDrag to edge resistance functions

Browse Source 
This code will be poked exclusively from the MetaWindowDrag, so
change the API to start passing this object around.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2683>
This commit is contained in:
Carlos Garnacho 2022-10-27 18:01:02 +02:00 committed by Marge Bot
parent 36bda45888
commit 60f11e419f
3 changed files with 45 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/compositor/edge-resistance.c
View File

@ -1065,13 +1065,16 @@ compute_resistance_and_snapping_edges (MetaDisplay *display)
} }
void void
meta_window_edge_resistance_for_move (MetaWindow *window, meta_window_drag_edge_resistance_for_move (MetaWindowDrag *window_drag,
int *new_x, int *new_x,
int *new_y, int *new_y,
MetaEdgeResistanceFlags flags) MetaEdgeResistanceFlags flags)
{ {
MetaRectangle old_outer, proposed_outer, new_outer; MetaRectangle old_outer, proposed_outer, new_outer;
gboolean is_resize, is_keyboard_op, snap; gboolean is_resize, is_keyboard_op, snap;
MetaWindow *window;
window = meta_window_drag_get_window (window_drag);
meta_window_get_frame_rect (window, &old_outer); meta_window_get_frame_rect (window, &old_outer);
@ -1141,14 +1144,17 @@ meta_window_edge_resistance_for_move (MetaWindow *window,
} }
void void
meta_window_edge_resistance_for_resize (MetaWindow *window, meta_window_drag_edge_resistance_for_resize (MetaWindowDrag *window_drag,
int *new_width, int *new_width,
int *new_height, int *new_height,
MetaGravity gravity, MetaGravity gravity,
MetaEdgeResistanceFlags flags) MetaEdgeResistanceFlags flags)
{ {
MetaRectangle old_outer, new_outer; MetaRectangle old_outer, new_outer;
int proposed_outer_width, proposed_outer_height; int proposed_outer_width, proposed_outer_height;
MetaWindow *window;
window = meta_window_drag_get_window (window_drag);
meta_window_get_frame_rect (window, &old_outer); meta_window_get_frame_rect (window, &old_outer);
proposed_outer_width = *new_width; proposed_outer_width = *new_width;

21
src/compositor/edge-resistance.h
View File

@ -24,15 +24,18 @@
#include "core/window-private.h" #include "core/window-private.h"
void meta_window_edge_resistance_for_move (MetaWindow *window, #include "compositor/meta-window-drag.h"
int *new_x,
int *new_y, void meta_window_drag_edge_resistance_for_move (MetaWindowDrag *window_drag,
MetaEdgeResistanceFlags flags); int *new_x,
void meta_window_edge_resistance_for_resize (MetaWindow *window, int *new_y,
int *new_width, MetaEdgeResistanceFlags flags);
int *new_height,
MetaGravity gravity, void meta_window_drag_edge_resistance_for_resize (MetaWindowDrag *window_drag,
MetaEdgeResistanceFlags flags); int *new_width,
int *new_height,
MetaGravity gravity,
MetaEdgeResistanceFlags flags);
#endif /* META_EDGE_RESISTANCE_H */ #endif /* META_EDGE_RESISTANCE_H */

36
src/compositor/meta-window-drag.c
View File

@ -615,10 +615,10 @@ process_keyboard_move_grab (MetaWindowDrag *window_drag,
window_drag->last_edge_resistance_flags = window_drag->last_edge_resistance_flags =
flags & ~META_EDGE_RESISTANCE_KEYBOARD_OP; flags & ~META_EDGE_RESISTANCE_KEYBOARD_OP;
meta_window_edge_resistance_for_move (window, meta_window_drag_edge_resistance_for_move (window_drag,
&x, &x,
&y, &y,
flags); flags);
meta_window_move_frame (window, TRUE, x, y); meta_window_move_frame (window, TRUE, x, y);
update_keyboard_move (window_drag); update_keyboard_move (window_drag);
@ -970,11 +970,11 @@ process_keyboard_resize_grab (MetaWindowDrag *window_drag,
flags & ~META_EDGE_RESISTANCE_KEYBOARD_OP; flags & ~META_EDGE_RESISTANCE_KEYBOARD_OP;
/* Do any edge resistance/snapping */ /* Do any edge resistance/snapping */
meta_window_edge_resistance_for_resize (window, meta_window_drag_edge_resistance_for_resize (window_drag,
&width, &width,
&height, &height,
gravity, gravity,
flags); flags);
meta_window_resize_frame_with_gravity (window, meta_window_resize_frame_with_gravity (window,
TRUE, TRUE,
@ -1271,10 +1271,10 @@ update_move (MetaWindowDrag *window_drag,
flags & ~META_EDGE_RESISTANCE_KEYBOARD_OP; flags & ~META_EDGE_RESISTANCE_KEYBOARD_OP;
/* Do any edge resistance/snapping */ /* Do any edge resistance/snapping */
meta_window_edge_resistance_for_move (window, meta_window_drag_edge_resistance_for_move (window_drag,
&new_x, &new_x,
&new_y, &new_y,
flags); flags);
meta_window_move_frame (window, TRUE, new_x, new_y); meta_window_move_frame (window, TRUE, new_x, new_y);
} }
@ -1427,11 +1427,11 @@ update_resize (MetaWindowDrag *window_drag,
flags & ~META_EDGE_RESISTANCE_KEYBOARD_OP; flags & ~META_EDGE_RESISTANCE_KEYBOARD_OP;
/* Do any edge resistance/snapping */ /* Do any edge resistance/snapping */
meta_window_edge_resistance_for_resize (window, meta_window_drag_edge_resistance_for_resize (window_drag,
&new_rect.width, &new_rect.width,
&new_rect.height, &new_rect.height,
gravity, gravity,
flags); flags);
meta_window_resize_frame_with_gravity (window, TRUE, meta_window_resize_frame_with_gravity (window, TRUE,
new_rect.width, new_rect.height, new_rect.width, new_rect.height,