summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen W. Taylor <otaylor@fishsoup.net>2011-10-17 14:56:56 -0400
committerAlberts Muktupāvels <alberts.muktupavels@gmail.com>2015-04-15 15:08:18 +0300
commitc66d83a7e44e2d51e110a4c0d5d60caa103e5c31 (patch)
tree00a2192ca44f24ba06f8ae3ee9d831005050aa55
parent5aeae2fcc6763839333372086ee2825d40f0d7b4 (diff)
downloadmetacity-c66d83a7e44e2d51e110a4c0d5d60caa103e5c31.tar.gz
update window->has_resize_func at the right time when unfullscreening
Since the frame window size that meta_window_move_resize() uses depends on whether the window has horizontal/vertical resize functionality, we need to update this flag before we resize the window. https://bugzilla.gnome.org/show_bug.cgi?id=659854
-rw-r--r--src/core/window.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/core/window.c b/src/core/window.c
index 30b5e3ad..e9386783 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -2900,6 +2900,11 @@ meta_window_unmake_fullscreen (MetaWindow *window)
*/
ensure_size_hints_satisfied (&target_rect, &window->size_hints);
+ /* Need to update window->has_resize_func before we move_resize()
+ */
+ recalc_window_features (window);
+ set_net_wm_state (window);
+
meta_window_move_resize (window,
FALSE,
target_rect.x,
@@ -2912,9 +2917,6 @@ meta_window_unmake_fullscreen (MetaWindow *window)
force_save_user_window_placement (window);
meta_window_update_layer (window);
-
- recalc_window_features (window);
- set_net_wm_state (window);
}
}