AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

sizerequest: Make sure widget sizes stay positive

Browse Source 
They can otherwise become negative, e.g. when large negative css
margins are applied.
This commit is contained in:
Timm Bäder 2017-05-15 14:38:22 +02:00 committed by Matthias Clasen
parent 6d34a19cdd
commit b0c7a876a9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/gtksizerequest.c
View File

@ -462,10 +462,10 @@ gtk_widget_measure (GtkWidget *widget,
minimum_baseline, natural_baseline);
if (minimum)
*minimum = MAX (*minimum, css_min_size) + css_extra_size;
*minimum = MAX (0, MAX (*minimum, css_min_size) + css_extra_size);
if (natural)
*natural = MAX (*natural, css_min_size) + css_extra_size;
*natural = MAX (0, MAX (*natural, css_min_size) + css_extra_size);
/* TODO: Baselines! */
return;
@ -497,8 +497,8 @@ gtk_widget_measure (GtkWidget *widget,
gtk_widget_query_size_for_orientation (tmp_widget, orientation, for_size, &min_dimension, &nat_dimension, NULL, NULL);
min_result = MAX (min_result, MAX (min_dimension, css_min_size) + css_extra_size);
nat_result = MAX (nat_result, MAX (nat_dimension, css_min_size) + css_extra_size);
min_result = MAX (0, MAX (min_result, MAX (min_dimension, css_min_size) + css_extra_size));
nat_result = MAX (0, MAX (nat_result, MAX (nat_dimension, css_min_size) + css_extra_size));
}
g_hash_table_destroy (widgets);