diff options
author | Benjamin Otte <otte@redhat.com> | 2012-12-01 14:00:24 +0100 |
---|---|---|
committer | Benjamin Otte <otte@redhat.com> | 2012-12-01 14:00:24 +0100 |
commit | 0d9d5761725db00b5a42fe0f06f739953684c169 (patch) | |
tree | 83ea024e2c31a3eda6e6343eb07a5e1faf9dbe37 /gtk/gtkcssinitialvalue.c | |
parent | 1dd3ee6b594e7a9fe9aeca0be8c67aedada16764 (diff) | |
download | gtk+-0d9d5761725db00b5a42fe0f06f739953684c169.tar.gz |
css: Add more features to font-size code
We now support the keywords (like xx-small, medium, larger, smaller...)
and I've changed the default value to be "medium".
This required some shuffling of the "get default font size" code. But
all is well now.
Diffstat (limited to 'gtk/gtkcssinitialvalue.c')
-rw-r--r-- | gtk/gtkcssinitialvalue.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/gtk/gtkcssinitialvalue.c b/gtk/gtkcssinitialvalue.c index b70b794112..427044d574 100644 --- a/gtk/gtkcssinitialvalue.c +++ b/gtk/gtkcssinitialvalue.c @@ -73,31 +73,6 @@ gtk_css_value_initial_compute (GtkCssValue *value, } break; - case GTK_CSS_PROPERTY_FONT_SIZE: - settings = _gtk_style_provider_private_get_settings (provider); - if (settings) - { - PangoFontDescription *description; - char *font_name; - GtkCssValue *value; - - g_object_get (settings, "gtk-font-name", &font_name, NULL); - description = pango_font_description_from_string (font_name); - g_free (font_name); - if (description == NULL) - break; - - if (pango_font_description_get_set_fields (description) & PANGO_FONT_MASK_SIZE) - { - value = _gtk_css_number_value_new ((double) pango_font_description_get_size (description) / PANGO_SCALE, GTK_CSS_PX); - pango_font_description_free (description); - return value; - } - - pango_font_description_free (description); - } - break; - default: break; } |