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

sizerequest: Fix for_size adjustment

Browse Source 
We need to pull the proper size from the size request cache and adjust
it accordingly.
This commit is contained in:
Timm Bäder 2018-01-17 15:42:01 +01:00
parent 27c76db956
commit e7b3909fd1
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/gtksizerequest.c
View File

@ -154,7 +154,6 @@ gtk_widget_query_size_for_orientation (GtkWidget *widget,
if (!found_in_cache) if (!found_in_cache)
{ {
int adjusted_min, adjusted_natural; int adjusted_min, adjusted_natural;
int adjusted_for_size = for_size;
int reported_min_size = 0; int reported_min_size = 0;
int reported_nat_size = 0; int reported_nat_size = 0;
@ -188,29 +187,26 @@ gtk_widget_query_size_for_orientation (GtkWidget *widget,
} }
else else
{ {
int dummy = 0; int adjusted_for_size;
int minimum_for_size = 0; int minimum_for_size = 0;
int natural_for_size = 0; int natural_for_size = 0;
int dummy = 0;
/* Pull the base natural size from the cache as it's needed to adjust /* Pull the minimum for_size from the cache as it's needed to adjust
* the proposed 'for_size' */ * the proposed 'for_size' */
widget_class->measure (widget, OPPOSITE_ORIENTATION (orientation), -1, gtk_widget_measure (widget, OPPOSITE_ORIENTATION (orientation), -1,
&minimum_for_size, &natural_for_size, &dummy, &dummy); &minimum_for_size, &natural_for_size, NULL, NULL);
gtk_widget_adjust_size_allocation (widget,
OPPOSITE_ORIENTATION (orientation),
&minimum_for_size,
&natural_for_size,
&dummy,
&adjusted_for_size);
/* adjusted_for_size now without widget margins */
adjusted_for_size -= css_extra_for_size;
/* TODO: Warn if the given for_size is too small? */ /* TODO: Warn if the given for_size is too small? */
if (for_size < MAX (minimum_for_size, css_min_for_size))
for_size = MAX (minimum_for_size, css_min_for_size);
if (adjusted_for_size < MAX (minimum_for_size, css_min_for_size)) adjusted_for_size = for_size;
adjusted_for_size = MAX (minimum_for_size, css_min_for_size); gtk_widget_adjust_size_allocation (widget, OPPOSITE_ORIENTATION (orientation),
&for_size, &natural_for_size,
&dummy, &adjusted_for_size);
adjusted_for_size -= css_extra_for_size;
push_recursion_check (widget, orientation); push_recursion_check (widget, orientation);
widget_class->measure (widget, widget_class->measure (widget,