diff options
| author | Owen Taylor <otaylor@redhat.com> | 2001-12-26 17:06:13 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2001-12-26 17:06:13 +0000 |
| commit | e1033f5f5acbabd27b788910974b7b4f821bc33c (patch) | |
| tree | 2b4b8b9001e15ef715ad101ddb927c7a02073b70 /gtk/gtkrc.c | |
| parent | 9ad1895548be8a8761219aeaac713f69d2fda4ae (diff) | |
| download | gdk-pixbuf-e1033f5f5acbabd27b788910974b7b4f821bc33c.tar.gz | |
(#67542, reported by Anders Carlsson)
Wed Dec 26 11:49:01 2001 Owen Taylor <otaylor@redhat.com>
(#67542, reported by Anders Carlsson)
* gtk/gtkstyle.c (gtk_style_real_init_from_rc): Merge
rc_style->font_desc with defaul style instead of replacing
it.
* gtk/gtkrc.c (gtk_rc_style_real_merge): Allow partial
font descriptions in RC styles by calling
pango_font_description_merge().
Diffstat (limited to 'gtk/gtkrc.c')
| -rw-r--r-- | gtk/gtkrc.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c index 355a134aa..ab453891d 100644 --- a/gtk/gtkrc.c +++ b/gtk/gtkrc.c @@ -1176,8 +1176,13 @@ gtk_rc_style_real_merge (GtkRcStyle *dest, if (dest->ythickness < 0 && src->ythickness >= 0) dest->ythickness = src->ythickness; - if (!dest->font_desc && src->font_desc) - dest->font_desc = pango_font_description_copy (src->font_desc); + if (src->font_desc) + { + if (!dest->font_desc) + dest->font_desc = pango_font_description_copy (src->font_desc); + else + pango_font_description_merge (dest->font_desc, src->font_desc, FALSE); + } if (src->rc_properties) { |