Fix gtkmisc padding calculation
Actually sum css padding and gtkmisc padding as intended in the previous patch.
This commit is contained in:
parent
880daf8bb2
commit
31e89b44da
@ -425,9 +425,10 @@ _gtk_misc_get_padding_and_border (GtkMisc *misc,
|
|||||||
gtk_style_context_get_padding (context, state, border);
|
gtk_style_context_get_padding (context, state, border);
|
||||||
|
|
||||||
gtk_misc_get_padding (misc, &xpad, &ypad);
|
gtk_misc_get_padding (misc, &xpad, &ypad);
|
||||||
|
border->top += ypad;
|
||||||
border->right = border->left = xpad;
|
border->left += xpad;
|
||||||
border->top = border->bottom = xpad;
|
border->bottom += ypad;
|
||||||
|
border->right += xpad;
|
||||||
|
|
||||||
gtk_style_context_get_border (context, state, &tmp);
|
gtk_style_context_get_border (context, state, &tmp);
|
||||||
border->top += tmp.top;
|
border->top += tmp.top;
|
||||||
|
Loading…
Reference in New Issue
Block a user