AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-27 06:00:22 +00:00
Code Issues Projects Releases Wiki Activity

window: Always clamp to max size

Browse Source 
When computing the window size, always try to clamp to the max size.
This will shrink a window down into a sane size if it was too big
before.
This commit is contained in:
Benjamin Otte 2021-11-21 05:32:20 +01:00
parent 344fac5aa7
commit 358893aa84
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
gtk/gtkwindow.c
View File

@ -4184,20 +4184,18 @@ gtk_window_compute_default_size (GtkWindow *window,
&minimum, &natural,
NULL, NULL);
*min_height = minimum;
if (cur_height > 0)
*height = MAX (cur_height, minimum);
else
*height = MAX (minimum, MIN (max_height, natural));
if (cur_height <= 0)
cur_height = natural;
*height = MAX (minimum, MIN (max_height, cur_height));
gtk_widget_measure (widget, GTK_ORIENTATION_HORIZONTAL,
*height,
&minimum, &natural,
NULL, NULL);
*min_width = minimum;
if (cur_width > 0)
*width = MAX (cur_width, minimum);
else
*width = MAX (minimum, MIN (max_width, natural));
if (cur_width <= 0)
cur_width = natural;
*width = MAX (minimum, MIN (max_width, cur_width));
}
else /* GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH or CONSTANT_SIZE */
{
@ -4207,20 +4205,19 @@ gtk_window_compute_default_size (GtkWindow *window,
&minimum, &natural,
NULL, NULL);
*min_width = minimum;
if (cur_width > 0)
*width = MAX (cur_width, minimum);
else
*width = MAX (minimum, MIN (max_width, natural));
if (cur_width <= 0)
cur_width = natural;
*width = MAX (minimum, MIN (max_width, cur_width));
gtk_widget_measure (widget, GTK_ORIENTATION_VERTICAL,
*width,
&minimum, &natural,
NULL, NULL);
*min_height = minimum;
if (cur_height > 0)
*height = MAX (cur_height, minimum);
else
*height = MAX (minimum, MIN (max_height, natural));
if (cur_height <= 0)
cur_height = natural;
*height = MAX (minimum, MIN (max_height, cur_height));
}
}
@ -4262,7 +4259,6 @@ toplevel_compute_size (GdkToplevel *toplevel,
&min_width, &min_height,
&width, &height);
if (width < min_width)
width = min_width;
if (height < min_height)