AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-15 23:00:08 +00:00
Code Issues Projects Releases Wiki Activity

sizerequest: Only check reported baselines if requested

Browse Source 
If the passed-in store locations for the baselines are NULL anyway, we
don't need to check the reported baselines for correctness.
This commit is contained in:
Timm Bäder 2018-07-15 17:56:11 +02:00
parent 392b4d9ac5
commit cf7fa931d3
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gtk/gtksizerequest.c
View File

@ -129,6 +129,7 @@ gtk_widget_query_size_for_orientation (GtkWidget *widget,
gint *minimum_baseline, gint *minimum_baseline,
gint *natural_baseline) gint *natural_baseline)
{ {
const gboolean baselines_requested = (minimum_baseline != NULL || natural_baseline != NULL);
SizeRequestCache *cache; SizeRequestCache *cache;
gint min_size = 0; gint min_size = 0;
gint nat_size = 0; gint nat_size = 0;
@ -291,7 +292,7 @@ gtk_widget_query_size_for_orientation (GtkWidget *widget,
nat_size = adjusted_natural; nat_size = adjusted_natural;
} }
if (min_baseline != -1 || nat_baseline != -1) if (baselines_requested && (min_baseline != -1 || nat_baseline != -1))
{ {
if (orientation == GTK_ORIENTATION_HORIZONTAL) if (orientation == GTK_ORIENTATION_HORIZONTAL)
{ {