[gtk+/gtk-3-20] gtkwindow: Don't allow unresizable windows to be smaller than required

[Rui Matos <rtcm src gnome org>]

commit b4143c6af95d7864b8bc9f120061e41d1987f00f
Author: Rui Matos <tiagomatos gmail com>
Date:   Thu Mar 31 20:56:01 2016 +0200

    gtkwindow: Don't allow unresizable windows to be smaller than required
    
    Commit cdc580463e409a9b7e5f1480afa68d875ff3ff65 made it so that
    unresizable windows can't be smaller than a set default size but it
    lost the logic to ensure these windows remain at least big enough to
    comply with their requisition.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=764174

 gtk/gtkwindow.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index a7f86de..5922415 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -10036,14 +10036,16 @@ gtk_window_update_fixed_size (GtkWindow   *window,
 
       if (info->default_width > -1)
         {
-          new_geometry->min_width = MAX (default_width_csd, new_width);
-          new_geometry->max_width = new_geometry->min_width;
+          gint w = MAX (MAX (default_width_csd, new_width), new_geometry->min_width);
+          new_geometry->min_width = w;
+          new_geometry->max_width = w;
         }
 
       if (info->default_height > -1)
         {
-          new_geometry->min_height = MAX (default_height_csd, new_height);
-          new_geometry->max_height = new_geometry->min_height;
+          gint h = MAX (MAX (default_height_csd, new_height), new_geometry->min_height);
+          new_geometry->min_height = h;
+          new_geometry->max_height = h;
         }
     }
 }