gtkwindow: Fix regression with fixed size windows

Previous commit to address the default size introduced a regression
with fixed size windows if no default size was given, the resulting
window would end up much smaller than its actual content.
This commit is contained in:
Olivier Fourdan 2016-03-03 17:47:35 +01:00
parent a37ea5dafd
commit 4a729dc233

View File

@ -9138,8 +9138,10 @@ gtk_window_compute_configure_request (GtkWindow *window,
{ {
new_flags |= GDK_HINT_MAX_SIZE; new_flags |= GDK_HINT_MAX_SIZE;
new_geometry.max_width = new_geometry.min_width = w; new_geometry.min_width = MAX (w, new_geometry.min_width);
new_geometry.max_height = new_geometry.min_height = h; new_geometry.max_width = new_geometry.min_width;
new_geometry.min_height = MAX (h, new_geometry.min_height);
new_geometry.max_height = new_geometry.min_height;
} }
gtk_window_constrain_size (window, gtk_window_constrain_size (window,