[mutter/gnome-3-36] core/window: Move size hints to dedicated function

[Marge Bot <marge-bot src gnome org>]

commit f8eff48324a313051038bda3205c525c7bac317a
Author: Christian Rauch <Rauch Christian gmx de>
Date:   Sat Jan 4 21:03:53 2020 +0000

    core/window: Move size hints to dedicated function
    
    https://gitlab.gnome.org/GNOME/mutter/merge_requests/801#note_676932
    (cherry picked from commit 3faea8532c0935ee07ff2fff0517f230aa5d6c0c)
    
    Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1598>

 src/core/window.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/src/core/window.c b/src/core/window.c
index 420c221ae8..7f18707cb1 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -3275,6 +3275,15 @@ unmaximize_window_before_freeing (MetaWindow        *window)
 #endif
 }
 
+static void
+meta_window_maybe_apply_size_hints (MetaWindow    *window,
+                                    MetaRectangle *target_rect)
+{
+  meta_window_frame_rect_to_client_rect (window, target_rect, target_rect);
+  ensure_size_hints_satisfied (target_rect, &window->size_hints);
+  meta_window_client_rect_to_frame_rect (window, target_rect, target_rect);
+}
+
 void
 meta_window_unmaximize (MetaWindow        *window,
                         MetaMaximizeFlags  directions)
@@ -3372,9 +3381,7 @@ meta_window_unmaximize (MetaWindow        *window,
       /* Window's size hints may have changed while maximized, making
        * saved_rect invalid.  #329152
        */
-      meta_window_frame_rect_to_client_rect (window, &target_rect, &target_rect);
-      ensure_size_hints_satisfied (&target_rect, &window->size_hints);
-      meta_window_client_rect_to_frame_rect (window, &target_rect, &target_rect);
+      meta_window_maybe_apply_size_hints (window, &target_rect);
 
       meta_compositor_size_change_window (window->display->compositor, window,
                                           META_SIZE_CHANGE_UNMAXIMIZE,
@@ -3529,9 +3536,7 @@ meta_window_unmake_fullscreen (MetaWindow  *window)
       /* Window's size hints may have changed while maximized, making
        * saved_rect invalid.  #329152
        */
-      meta_window_frame_rect_to_client_rect (window, &target_rect, &target_rect);
-      ensure_size_hints_satisfied (&target_rect, &window->size_hints);
-      meta_window_client_rect_to_frame_rect (window, &target_rect, &target_rect);
+      meta_window_maybe_apply_size_hints (window, &target_rect);
 
       /* Need to update window->has_resize_func before we move_resize()
        */