isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-26 10:00:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

display: Use grab_op_is_moving_or_resizing

Browse Source
This commit is contained in:
Jasper St. Pierre 2014-04-20 13:00:33 -04:00
parent f9305be450
commit 9ca0349c2b
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/display.c
View File

@ -1996,11 +1996,10 @@ meta_display_end_grab_op (MetaDisplay *display,
if (display->grab_window != NULL) if (display->grab_window != NULL)
display->grab_window->shaken_loose = FALSE; display->grab_window->shaken_loose = FALSE;
if (display->grab_window != NULL && if (display->grab_window != NULL &&
!meta_prefs_get_raise_on_click () && !meta_prefs_get_raise_on_click () &&
(meta_grab_op_is_moving (display->grab_op) || meta_grab_op_is_moving_or_resizing (display->grab_op))
meta_grab_op_is_resizing (display->grab_op)))
{ {
/* Only raise the window in orthogonal raise /* Only raise the window in orthogonal raise
* ('do-not-raise-on-click') mode if the user didn't try to move * ('do-not-raise-on-click') mode if the user didn't try to move
@ -2011,10 +2010,9 @@ meta_display_end_grab_op (MetaDisplay *display,
if (!display->grab_threshold_movement_reached) if (!display->grab_threshold_movement_reached)
meta_window_raise (display->grab_window); meta_window_raise (display->grab_window);
} }
/* If this was a move or resize clear out the edge cache */ /* If this was a move or resize clear out the edge cache */
if (meta_grab_op_is_resizing (display->grab_op) || if (meta_grab_op_is_moving_or_resizing (display->grab_op))
meta_grab_op_is_moving (display->grab_op))
{ {
meta_topic (META_DEBUG_WINDOW_OPS, meta_topic (META_DEBUG_WINDOW_OPS,
"Clearing out the edges for resistance/snapping"); "Clearing out the edges for resistance/snapping");