summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2005-07-25 01:39:24 +0000
committerElijah Newren <newren@src.gnome.org>2005-07-25 01:39:24 +0000
commitc64bda776bcd5b5c2bff9baf0b16a65d7577536c (patch)
treef719002056de0b6d6d48c3456bdabe8352149a89
parentef5c3f976ad0b07d91715f2a61b16428d6fd7178 (diff)
downloadmetacity-c64bda776bcd5b5c2bff9baf0b16a65d7577536c.tar.gz
restore original window size if the window was maximized, as the FIXME
2005-07-24 Elijah Newren <newren@gmail.com> * src/window.c (meta_window_free): restore original window size if the window was maximized, as the FIXME says. ;-) Fixes #137185.
-rw-r--r--ChangeLog7
-rw-r--r--src/window.c5
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 85541300..29e07bf9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
+2005-07-24 Elijah Newren <newren@gmail.com>
+
+ * 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 <newren@gmail.com>
- * 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 f5ef79e6..d79d7625 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);