isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-23 16:34:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix problem with window unmaximization

Browse Source 
A mismerge of the Metacity commit "4943d79 Prevent window self-maximisation"
caused the window's user set size and position to be saved *before*
actually resizing the window to the unmaximized position rather than after.

This meant that after unmaximization the window was in an inconsistent
state and anything that caused a resize to be queued (like a change in
window properties by the application) would cause it to pop back to
the maximized size and position.

https://bugzilla.gnome.org/show_bug.cgi?id=621413
This commit is contained in:
Owen W. Taylor 2010-06-14 16:40:38 -04:00
parent 275a6ec63f
commit ff5a73de49
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/window.c
View File

@ -3235,10 +3235,6 @@ meta_window_unmaximize (MetaWindow *window,
window->display->grab_anchor_window_pos = target_rect; window->display->grab_anchor_window_pos = target_rect;
} }
/* Make sure user_rect is current.
*/
force_save_user_window_placement (window);
if (window->display->compositor) if (window->display->compositor)
{ {
MetaRectangle old_rect, new_rect; MetaRectangle old_rect, new_rect;
@ -3268,6 +3264,10 @@ meta_window_unmaximize (MetaWindow *window,
target_rect.height); target_rect.height);
} }
/* Make sure user_rect is current.
*/
force_save_user_window_placement (window);
recalc_window_features (window); recalc_window_features (window);
set_net_wm_state (window); set_net_wm_state (window);
} }