From 01417e5675fba04549ab0f818fc83a57969b257c Mon Sep 17 00:00:00 2001 From: Victor Kareh Date: Thu, 30 May 2019 15:03:15 -0400 Subject: 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 --- src/core/window.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/core/window.c b/src/core/window.c index 8e0d89bd..3ddb21c3 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); } } -- cgit v1.2.1