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

(#67542, reported by Anders Carlsson)

Browse Source 
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().
This commit is contained in:
Owen Taylor
2001-12-26 17:06:13 +00:00
committed by Owen Taylor
parent 9ad1895548
commit e1033f5f5a
9 changed files with 92 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gtk/gtkrc.c
View File

@ -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)
{