callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

themingbackground: Remove struct members

Browse Source 
... and put them in the only function they are used in.
This commit is contained in:
Benjamin Otte
2012-10-27 03:22:03 +02:00
parent 762e2d9322
commit 2e287576b4
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gtk/gtkthemingbackground.c
View File

@ -276,9 +276,10 @@ static void
_gtk_theming_background_init_context (GtkThemingBackground *bg) _gtk_theming_background_init_context (GtkThemingBackground *bg)
{ {
GtkStateFlags flags = gtk_style_context_get_state (bg->context); GtkStateFlags flags = gtk_style_context_get_state (bg->context);
GtkBorder border, padding;
gtk_style_context_get_border (bg->context, flags, &bg->border); gtk_style_context_get_border (bg->context, flags, &border);
gtk_style_context_get_padding (bg->context, flags, &bg->padding); gtk_style_context_get_padding (bg->context, flags, &padding);
gtk_style_context_get_background_color (bg->context, flags, &bg->bg_color); gtk_style_context_get_background_color (bg->context, flags, &bg->bg_color);
/* In the CSS box model, by default the background positioning area is /* In the CSS box model, by default the background positioning area is
@ -294,13 +295,13 @@ _gtk_theming_background_init_context (GtkThemingBackground *bg)
bg->padding_box = bg->border_box; bg->padding_box = bg->border_box;
_gtk_rounded_box_shrink (&bg->padding_box, _gtk_rounded_box_shrink (&bg->padding_box,
bg->border.top, bg->border.right, border.top, border.right,
bg->border.bottom, bg->border.left); border.bottom, border.left);
bg->content_box = bg->padding_box; bg->content_box = bg->padding_box;
_gtk_rounded_box_shrink (&bg->content_box, _gtk_rounded_box_shrink (&bg->content_box,
bg->padding.top, bg->padding.right, padding.top, padding.right,
bg->padding.bottom, bg->padding.left); padding.bottom, padding.left);
} }
void void

2
gtk/gtkthemingbackgroundprivate.h
View File

@ -40,8 +40,6 @@ struct _GtkThemingBackground {
GtkRoundedBox content_box; GtkRoundedBox content_box;
GtkJunctionSides junction; GtkJunctionSides junction;
GtkBorder border;
GtkBorder padding;
GdkRGBA bg_color; GdkRGBA bg_color;
}; };