summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorElijah Newren <newren gmail com>2006-08-07 19:24:41 +0000
committerElijah Newren <newren@src.gnome.org>2006-08-07 19:24:41 +0000
commitd4973e8d1ba562cafabd58b6642cad3f06d617d6 (patch)
treeee53b900a59348a33b6224586af0d2865fcc97b2 /src
parent1dd78e38ffbbe83ebf602ad372d32a45b4e5bbfb (diff)
downloadmetacity-d4973e8d1ba562cafabd58b6642cad3f06d617d6.tar.gz
Patch from Thomas Andersen to return the window to maximized state if the
2006-08-07 Elijah Newren <newren gmail com> * src/keybindings.c (process_keyboard_move_grab): Patch from Thomas Andersen to return the window to maximized state if the window was "shaken loose" from maximized state during a resize but the resize is later aborted. #346719.
Diffstat (limited to 'src')
-rw-r--r--src/keybindings.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/keybindings.c b/src/keybindings.c
index 77dc78a9..9da20ca5 100644
--- a/src/keybindings.c
+++ b/src/keybindings.c
@@ -1768,13 +1768,17 @@ process_keyboard_move_grab (MetaDisplay *display,
* since in wireframe we always moveresize at the end
* of the grab only.
*/
- if (!display->grab_wireframe_active)
+ if (!display->grab_wireframe_active && !window->shaken_loose)
meta_window_move_resize (display->grab_window,
TRUE,
display->grab_initial_window_pos.x,
display->grab_initial_window_pos.y,
display->grab_initial_window_pos.width,
display->grab_initial_window_pos.height);
+ if(window->shaken_loose)
+ meta_window_maximize (window,
+ META_MAXIMIZE_HORIZONTAL |
+ META_MAXIMIZE_VERTICAL);
display->grab_was_cancelled = TRUE;
}