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

widget: Query CSS values later in size_allocate

Browse Source 
Move it below the "this widget only changed its position" check.
This commit is contained in:
Timm Bäder 2018-11-27 06:00:30 +01:00
parent f92745aacf
commit eebb849760
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gtk/gtkwidget.c
View File

@ -4128,11 +4128,6 @@ gtk_widget_size_allocate (GtkWidget *widget,
priv->allocated_size = *allocation;
priv->allocated_size_baseline = baseline;
style = gtk_css_node_get_style (priv->cssnode);
get_box_margin (style, &margin);
get_box_border (style, &border);
get_box_padding (style, &padding);
adjusted_allocation = real_allocation;
if (gtk_widget_get_request_mode (widget) == GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH)
{
@ -4245,6 +4240,11 @@ gtk_widget_size_allocate (GtkWidget *widget,
goto check_clip;
}
style = gtk_css_node_get_style (priv->cssnode);
get_box_margin (style, &margin);
get_box_border (style, &border);
get_box_padding (style, &padding);
/* Since gtk_widget_measure does it for us, we can be sure here that
* the given alloaction is large enough for the css margin/bordder/padding */
real_allocation.x = 0;