AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-10 19:00:08 +00:00
Code Issues Projects Releases Wiki Activity

size-request: Clamp size requests to screen size

Browse Source 
Size requests should only ever need to return the screen's width/height
and max. This way, potentially large widgets (tree view or icon view)
don't need to do so many computations, but can stop when their computed
size has reached the screen size.
This commit is contained in:
Benjamin Otte 2010-12-15 10:33:02 +01:00
parent 208d717fef
commit 544146b9be
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gtk/gtksizerequest.c
View File

@ -239,6 +239,14 @@ compute_size_for_orientation (GtkWidget *widget,
&min_size, &nat_size);
pop_recursion_check (widget, orientation);
}
#ifndef G_DISABLE_CHECKS
if (gtk_widget_get_screen (widget))
{
guint screen_width = gdk_screen_get_width (gtk_widget_get_screen (widget));
min_size = MIN (min_size, screen_width);
nat_size = MIN (nat_size, screen_width);
}
#endif
}
else
{
@ -272,6 +280,14 @@ compute_size_for_orientation (GtkWidget *widget,
&min_size, &nat_size);
pop_recursion_check (widget, orientation);
}
#ifndef G_DISABLE_CHECKS
if (gtk_widget_get_screen (widget))
{
guint screen_height = gdk_screen_get_height (gtk_widget_get_screen (widget));
min_size = MIN (min_size, screen_height);
nat_size = MIN (nat_size, screen_height);
}
#endif
}
if (min_size > nat_size)