[metacity] theme: move meta_theme_get_title_scale to libmetacity



commit aac68269e8a2909ae510e9eb5ffe1f627bd408ee
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Wed Feb 3 22:26:00 2016 +0200

    theme: move meta_theme_get_title_scale to libmetacity

 libmetacity/meta-theme.c |   18 ++++++++++++++++++
 libmetacity/meta-theme.h |    4 ++++
 src/ui/theme.c           |   18 ------------------
 src/ui/theme.h           |    4 ----
 4 files changed, 22 insertions(+), 22 deletions(-)
---
diff --git a/libmetacity/meta-theme.c b/libmetacity/meta-theme.c
index 193fcbd..5550bdc 100644
--- a/libmetacity/meta-theme.c
+++ b/libmetacity/meta-theme.c
@@ -455,6 +455,24 @@ meta_frame_type_from_string (const gchar *str)
     return META_FRAME_TYPE_LAST;
 }
 
+gdouble
+meta_theme_get_title_scale (MetaTheme     *theme,
+                            MetaFrameType  type,
+                            MetaFrameFlags flags)
+{
+  MetaFrameStyle *style;
+
+  g_return_val_if_fail (type < META_FRAME_TYPE_LAST, 1.0);
+
+  style = meta_theme_get_frame_style (theme, type, flags);
+
+  /* Parser is not supposed to allow this currently */
+  if (style == NULL)
+    return 1.0;
+
+  return style->layout->title_scale;
+}
+
 gboolean
 meta_theme_allows_shade_stick_above_buttons (MetaTheme *theme)
 {
diff --git a/libmetacity/meta-theme.h b/libmetacity/meta-theme.h
index 0681b16..ac68c90 100644
--- a/libmetacity/meta-theme.h
+++ b/libmetacity/meta-theme.h
@@ -189,6 +189,10 @@ gint                  meta_pango_font_desc_get_text_height (const PangoFontDescr
 
 MetaFrameType         meta_frame_type_from_string          (const gchar                 *str);
 
+gdouble               meta_theme_get_title_scale           (MetaTheme                   *theme,
+                                                            MetaFrameType                type,
+                                                            MetaFrameFlags               flags);
+
 gboolean              meta_theme_allows_shade_stick_above_buttons (MetaTheme *theme);
 
 G_END_DECLS
diff --git a/src/ui/theme.c b/src/ui/theme.c
index 2d9b742..8370f8b 100644
--- a/src/ui/theme.c
+++ b/src/ui/theme.c
@@ -1569,24 +1569,6 @@ meta_theme_set_current (const gchar                *name,
     }
 }
 
-double
-meta_theme_get_title_scale (MetaTheme     *theme,
-                            MetaFrameType  type,
-                            MetaFrameFlags flags)
-{
-  MetaFrameStyle *style;
-
-  g_return_val_if_fail (type < META_FRAME_TYPE_LAST, 1.0);
-
-  style = meta_theme_get_frame_style (theme, type, flags);
-
-  /* Parser is not supposed to allow this currently */
-  if (style == NULL)
-    return 1.0;
-
-  return style->layout->title_scale;
-}
-
 void
 meta_theme_draw_frame (MetaTheme              *theme,
                        const gchar            *theme_variant,
diff --git a/src/ui/theme.h b/src/ui/theme.h
index 4aad669..5c1df6e 100644
--- a/src/ui/theme.h
+++ b/src/ui/theme.h
@@ -31,10 +31,6 @@ void       meta_theme_set_current (const char                 *name,
                                    gboolean                    composited,
                                    const PangoFontDescription *titlebar_font);
 
-double meta_theme_get_title_scale (MetaTheme     *theme,
-                                   MetaFrameType  type,
-                                   MetaFrameFlags flags);
-
 void meta_theme_draw_frame (MetaTheme              *theme,
                             const gchar            *variant,
                             cairo_t                *cr,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]