From c64bda776bcd5b5c2bff9baf0b16a65d7577536c Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Mon, 25 Jul 2005 01:39:24 +0000 Subject: [PATCH] restore original window size if the window was maximized, as the FIXME 2005-07-24 Elijah Newren * src/window.c (meta_window_free): restore original window size if the window was maximized, as the FIXME says. ;-) Fixes #137185. --- ChangeLog | 7 ++++++- src/window.c | 5 +++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 855413003..29e07bf91 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ +2005-07-24 Elijah Newren + + * src/window.c (meta_window_free): restore original window size if + the window was maximized, as the FIXME says. ;-) Fixes #137185. + 2005-07-23 Elijah Newren - * src/window.c: (meta_window_activate): revert the patch from + * src/window.c (meta_window_activate): revert the patch from #128380--change _NET_ACTIVE_WINDOW behavior to what it originally was. diff --git a/src/window.c b/src/window.c index f5ef79e62..d79d76257 100644 --- a/src/window.c +++ b/src/window.c @@ -959,6 +959,9 @@ meta_window_free (MetaWindow *window) if (window->display->focus_window == window) window->display->focus_window = NULL; + if (window->maximized) + meta_window_unmaximize (window); + meta_window_unqueue_calc_showing (window); meta_window_unqueue_move_resize (window); meta_window_unqueue_update_icon (window); @@ -984,8 +987,6 @@ meta_window_free (MetaWindow *window) meta_stack_remove (window->screen->stack, window); - /* FIXME restore original size if window has maximized */ - if (window->frame) meta_window_destroy_frame (window);