X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkcssenumvalue.c;h=e1f1d1c478b0af6a149855af1455b623b2b8552d;hb=1ddfc3a985d7b7652a0106699b2cf2d2abf7abe3;hp=77d5e8eaba2463f56eeb7cb545b81e03aded8d94;hpb=a23bc88557f53080dcd6cf59bf024d230f4439b7;p=~andy%2Fgtk

diff --git a/gtk/gtkcssenumvalue.c b/gtk/gtkcssenumvalue.c
index 77d5e8eab..e1f1d1c47 100644
--- a/gtk/gtkcssenumvalue.c
+++ b/gtk/gtkcssenumvalue.c
@@ -133,8 +133,8 @@ _gtk_css_border_style_value_get (const GtkCssValue *value)
  */
 #define DEFAULT_FONT_SIZE 10
 
-static double
-get_default_font_size (GtkStyleProviderPrivate *provider)
+double
+_gtk_css_font_size_get_default (GtkStyleProviderPrivate *provider)
 {
   GtkSettings *settings;
   PangoFontDescription *description;
@@ -173,46 +173,46 @@ gtk_css_value_font_size_compute (GtkCssValue             *value,
   switch (value->value)
     {
     case GTK_CSS_FONT_SIZE_XX_SMALL:
-      font_size = get_default_font_size (provider) * 3. / 5;
+      font_size = _gtk_css_font_size_get_default (provider) * 3. / 5;
       break;
     case GTK_CSS_FONT_SIZE_X_SMALL:
-      font_size = get_default_font_size (provider) * 3. / 4;
+      font_size = _gtk_css_font_size_get_default (provider) * 3. / 4;
       break;
     case GTK_CSS_FONT_SIZE_SMALL:
-      font_size = get_default_font_size (provider) * 8. / 9;
+      font_size = _gtk_css_font_size_get_default (provider) * 8. / 9;
       break;
     default:
       g_assert_not_reached ();
       /* fall thru */
     case GTK_CSS_FONT_SIZE_MEDIUM:
-      font_size = get_default_font_size (provider);
+      font_size = _gtk_css_font_size_get_default (provider);
       break;
     case GTK_CSS_FONT_SIZE_LARGE:
-      font_size = get_default_font_size (provider) * 6. / 5;
+      font_size = _gtk_css_font_size_get_default (provider) * 6. / 5;
       break;
     case GTK_CSS_FONT_SIZE_X_LARGE:
-      font_size = get_default_font_size (provider) * 3. / 2;
+      font_size = _gtk_css_font_size_get_default (provider) * 3. / 2;
       break;
     case GTK_CSS_FONT_SIZE_XX_LARGE:
-      font_size = get_default_font_size (provider) * 2;
+      font_size = _gtk_css_font_size_get_default (provider) * 2;
       break;
     case GTK_CSS_FONT_SIZE_SMALLER:
       *dependencies = GTK_CSS_DEPENDS_ON_PARENT;
       if (parent_values)
         font_size = _gtk_css_number_value_get (_gtk_css_computed_values_get_value (parent_values, GTK_CSS_PROPERTY_FONT_SIZE), 100);
       else
-        font_size = get_default_font_size (provider);
+        font_size = _gtk_css_font_size_get_default (provider);
       /* XXX: This is what WebKit does... */
-      font_size *= 1.2;
+      font_size /= 1.2;
       break;
     case GTK_CSS_FONT_SIZE_LARGER:
       *dependencies = GTK_CSS_DEPENDS_ON_PARENT;
       if (parent_values)
         font_size = _gtk_css_number_value_get (_gtk_css_computed_values_get_value (parent_values, GTK_CSS_PROPERTY_FONT_SIZE), 100);
       else
-        font_size = get_default_font_size (provider);
+        font_size = _gtk_css_font_size_get_default (provider);
       /* XXX: This is what WebKit does... */
-      font_size /= 1.2;
+      font_size *= 1.2;
       break;
   }
 
@@ -228,15 +228,15 @@ static const GtkCssValueClass GTK_CSS_VALUE_FONT_SIZE = {
 };
 
 static GtkCssValue font_size_values[] = {
+  { &GTK_CSS_VALUE_FONT_SIZE, 1, GTK_CSS_FONT_SIZE_SMALLER, "smaller" },
+  { &GTK_CSS_VALUE_FONT_SIZE, 1, GTK_CSS_FONT_SIZE_LARGER, "larger" },
   { &GTK_CSS_VALUE_FONT_SIZE, 1, GTK_CSS_FONT_SIZE_XX_SMALL, "xx-small" },
   { &GTK_CSS_VALUE_FONT_SIZE, 1, GTK_CSS_FONT_SIZE_X_SMALL, "x-small" },
   { &GTK_CSS_VALUE_FONT_SIZE, 1, GTK_CSS_FONT_SIZE_SMALL, "small" },
   { &GTK_CSS_VALUE_FONT_SIZE, 1, GTK_CSS_FONT_SIZE_MEDIUM, "medium" },
   { &GTK_CSS_VALUE_FONT_SIZE, 1, GTK_CSS_FONT_SIZE_LARGE, "large" },
   { &GTK_CSS_VALUE_FONT_SIZE, 1, GTK_CSS_FONT_SIZE_X_LARGE, "x-large" },
-  { &GTK_CSS_VALUE_FONT_SIZE, 1, GTK_CSS_FONT_SIZE_XX_LARGE, "xx-large" },
-  { &GTK_CSS_VALUE_FONT_SIZE, 1, GTK_CSS_FONT_SIZE_SMALLER, "smaller" },
-  { &GTK_CSS_VALUE_FONT_SIZE, 1, GTK_CSS_FONT_SIZE_LARGER, "larger" },
+  { &GTK_CSS_VALUE_FONT_SIZE, 1, GTK_CSS_FONT_SIZE_XX_LARGE, "xx-large" }
 };
 
 GtkCssValue *