AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-18 09:00:34 +00:00
Code Issues Projects Releases Wiki Activity

GtkStyle: Fill in x/ythickness and font_desc from the style context.

Browse Source
This commit is contained in:
Carlos Garnacho 2010-08-30 22:39:47 +02:00
parent 643abe3127
commit 58a51bca97
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gtk/gtkcssprovider.c
View File

@ -1783,6 +1783,7 @@ gtk_css_provider_get_default (void)
" foreground-color: @fg_color;\n" " foreground-color: @fg_color;\n"
" text-color: @text_color; \n" " text-color: @text_color; \n"
" base-color: @base_color; \n" " base-color: @base_color; \n"
" padding: 2 2; \n"
"}\n" "}\n"
"\n" "\n"
"*:prelight {\n" "*:prelight {\n"

14
gtk/gtkstyle.c
View File

@ -685,6 +685,7 @@ gtk_style_update_from_context (GtkStyle *style)
{ {
GtkStylePrivate *priv; GtkStylePrivate *priv;
GtkStateType state; GtkStateType state;
GtkBorder *padding;
priv = GTK_STYLE_GET_PRIVATE (style); priv = GTK_STYLE_GET_PRIVATE (style);
@ -696,7 +697,18 @@ gtk_style_update_from_context (GtkStyle *style)
set_color (style, priv->context, state, GTK_RC_TEXT); set_color (style, priv->context, state, GTK_RC_TEXT);
} }
/* FIXME: thickness, font_desc */ if (style->font_desc)
pango_font_description_free (style->font_desc);
gtk_style_context_get (priv->context, state,
"font", &style->font_desc,
"padding", &padding,
NULL);
style->xthickness = padding->left;
style->ythickness = padding->top;
gtk_border_free (padding);
} }
static void static void