From d4973e8d1ba562cafabd58b6642cad3f06d617d6 Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Mon, 7 Aug 2006 19:24:41 +0000 Subject: Patch from Thomas Andersen to return the window to maximized state if the 2006-08-07 Elijah Newren * 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. --- ChangeLog | 7 +++++++ src/keybindings.c | 6 +++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a90d5529f..8e70c625c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-08-07 Elijah Newren + + * 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 Patch from Vytautas Liuolia to react to _NET_STARTUP_ID changes, 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; } -- cgit v1.2.1