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.
This commit is contained in:
Elijah Newren 2005-07-25 01:39:24 +00:00 committed by Elijah Newren
parent ef5c3f976a
commit c64bda776b
2 changed files with 9 additions and 3 deletions

View File

@ -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> 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 #128380--change _NET_ACTIVE_WINDOW behavior to what it originally
was. was.

View File

@ -959,6 +959,9 @@ meta_window_free (MetaWindow *window)
if (window->display->focus_window == window) if (window->display->focus_window == window)
window->display->focus_window = NULL; window->display->focus_window = NULL;
if (window->maximized)
meta_window_unmaximize (window);
meta_window_unqueue_calc_showing (window); meta_window_unqueue_calc_showing (window);
meta_window_unqueue_move_resize (window); meta_window_unqueue_move_resize (window);
meta_window_unqueue_update_icon (window); meta_window_unqueue_update_icon (window);
@ -984,8 +987,6 @@ meta_window_free (MetaWindow *window)
meta_stack_remove (window->screen->stack, window); meta_stack_remove (window->screen->stack, window);
/* FIXME restore original size if window has maximized */
if (window->frame) if (window->frame)
meta_window_destroy_frame (window); meta_window_destroy_frame (window);