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.

2 files changed, 12 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index a90d5529f..8e70c625c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 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.
+
+2006-08-07  Elijah Newren  <newren gmail com>
+
 	Patch from Vytautas Liuolia to react to _NET_STARTUP_ID changes,
 	as proposed for the new startup-notification/EWMH spec.  #347515
 
diff --git a/src/keybindings.c b/src/keybindings.c
index 77dc78a96..9da20ca5f 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;
     }