summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorVictor Kareh <[email protected]>2019-05-30 15:03:15 -0400
committerVictor Kareh <[email protected]>2019-06-05 10:49:37 -0400
commitda5dce7c6f30018b00846c4332a2c06a4b95ffc0 (patch)
tree42864b405b120d8212249f78793ecf68bf3f25bf /src
parent71fc84f4ea42bd2dc3db2208f83b2cf9af787d7b (diff)
downloadmarco-da5dce7c6f30018b00846c4332a2c06a4b95ffc0.tar.bz2
marco-da5dce7c6f30018b00846c4332a2c06a4b95ffc0.tar.xz
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 upstream commit: https://gitlab.gnome.org/GNOME/metacity/commit/c66d83a7
Diffstat (limited to 'src')
-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 b5f63363..3c1fa641 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -3029,6 +3029,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,
@@ -3041,9 +3046,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);
}
}