[metacity] theme: move meta_pango_font_desc_get_text_height to libmetacity

[Alberts Muktupāvels <muktupavels src gnome org>]

commit 1e87976ef41b277ee7fa39f088df92354d52250b
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Wed Feb 3 22:19:16 2016 +0200

    theme: move meta_pango_font_desc_get_text_height to libmetacity

 libmetacity/meta-theme.c |   26 ++++++++++++++++++++++++++
 libmetacity/meta-theme.h |    5 ++++-
 src/Makefile.am          |    1 -
 src/ui/draw-workspace.c  |    2 +-
 src/ui/frames.h          |    2 +-
 src/ui/preview-widget.c  |    1 -
 src/ui/theme-private.h   |   30 ------------------------------
 src/ui/theme-viewer.c    |    2 +-
 src/ui/theme.c           |   28 +---------------------------
 src/ui/ui.c              |    2 +-
 10 files changed, 35 insertions(+), 64 deletions(-)
---
diff --git a/libmetacity/meta-theme.c b/libmetacity/meta-theme.c
index 86818fe..e875ab9 100644
--- a/libmetacity/meta-theme.c
+++ b/libmetacity/meta-theme.c
@@ -406,6 +406,32 @@ meta_style_info_create_font_desc (MetaTheme     *theme,
   return font_desc;
 }
 
+/**
+ * Returns the height of the letters in a particular font.
+ *
+ * \param font_desc  the font
+ * \param context  the context of the font
+ * \return  the height of the letters
+ */
+gint
+meta_pango_font_desc_get_text_height (const PangoFontDescription *font_desc,
+                                      PangoContext               *context)
+{
+  PangoFontMetrics *metrics;
+  PangoLanguage *lang;
+  int retval;
+
+  lang = pango_context_get_language (context);
+  metrics = pango_context_get_metrics (context, font_desc, lang);
+
+  retval = PANGO_PIXELS (pango_font_metrics_get_ascent (metrics) +
+                         pango_font_metrics_get_descent (metrics));
+
+  pango_font_metrics_unref (metrics);
+
+  return retval;
+}
+
 gboolean
 meta_theme_allows_shade_stick_above_buttons (MetaTheme *theme)
 {
diff --git a/libmetacity/meta-theme.h b/libmetacity/meta-theme.h
index d1b38a8..5179427 100644
--- a/libmetacity/meta-theme.h
+++ b/libmetacity/meta-theme.h
@@ -184,7 +184,10 @@ MetaFrameStyle       *meta_theme_get_frame_style           (MetaTheme
 PangoFontDescription *meta_style_info_create_font_desc     (MetaTheme                   *theme,
                                                             MetaStyleInfo               *style_info);
 
-gboolean             meta_theme_allows_shade_stick_above_buttons (MetaTheme *theme);
+gint                  meta_pango_font_desc_get_text_height (const PangoFontDescription  *font_desc,
+                                                            PangoContext                *context);
+
+gboolean              meta_theme_allows_shade_stick_above_buttons (MetaTheme *theme);
 
 G_END_DECLS
 
diff --git a/src/Makefile.am b/src/Makefile.am
index a3219dc..94670aa 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -118,7 +118,6 @@ libmetacity_private_la_SOURCES =            \
        include/common.h                        \
        ui/preview-widget.c                     \
        ui/preview-widget.h                     \
-       ui/theme-private.h                      \
        ui/theme.c                              \
        ui/theme.h                              \
        $(NULL)
diff --git a/src/ui/draw-workspace.c b/src/ui/draw-workspace.c
index cad156c..365f50b 100644
--- a/src/ui/draw-workspace.c
+++ b/src/ui/draw-workspace.c
@@ -28,7 +28,7 @@
 #include <libmetacity/meta-color.h>
 
 #include "draw-workspace.h"
-#include "theme-private.h"
+#include "theme.h"
 
 static void
 get_window_rect (const WnckWindowDisplayInfo *win,
diff --git a/src/ui/frames.h b/src/ui/frames.h
index 8fb49eb..77adb60 100644
--- a/src/ui/frames.h
+++ b/src/ui/frames.h
@@ -25,7 +25,7 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 #include "common.h"
-#include "theme-private.h"
+#include "theme.h"
 
 typedef enum
 {
diff --git a/src/ui/preview-widget.c b/src/ui/preview-widget.c
index 452f536..bf377b4 100644
--- a/src/ui/preview-widget.c
+++ b/src/ui/preview-widget.c
@@ -26,7 +26,6 @@
 #include <gtk/gtk.h>
 #include "common.h" /* for META_MINI_ICON_WIDTH */
 #include "preview-widget.h"
-#include "theme-private.h"
 
 static void     meta_preview_get_preferred_width  (GtkWidget *widget,
                                                    gint      *minimum,
diff --git a/src/ui/theme-viewer.c b/src/ui/theme-viewer.c
index d0b8400..6ad6741 100644
--- a/src/ui/theme-viewer.c
+++ b/src/ui/theme-viewer.c
@@ -21,7 +21,7 @@
 
 #include <config.h>
 #include "util.h"
-#include "theme-private.h"
+#include "theme.h"
 #include "preview-widget.h"
 #include <gtk/gtk.h>
 #include <time.h>
diff --git a/src/ui/theme.c b/src/ui/theme.c
index a1705bc..b1eec05 100644
--- a/src/ui/theme.c
+++ b/src/ui/theme.c
@@ -51,7 +51,7 @@
  */
 
 #include <config.h>
-#include "theme-private.h"
+#include "theme.h"
 #include "util.h"
 #include <gtk/gtk.h>
 #include <libmetacity/meta-color.h>
@@ -1714,32 +1714,6 @@ meta_theme_calc_geometry (MetaTheme              *theme,
                                    theme);
 }
 
-/**
- * Returns the height of the letters in a particular font.
- *
- * \param font_desc  the font
- * \param context  the context of the font
- * \return  the height of the letters
- */
-int
-meta_pango_font_desc_get_text_height (const PangoFontDescription *font_desc,
-                                      PangoContext         *context)
-{
-  PangoFontMetrics *metrics;
-  PangoLanguage *lang;
-  int retval;
-
-  lang = pango_context_get_language (context);
-  metrics = pango_context_get_metrics (context, font_desc, lang);
-
-  retval = PANGO_PIXELS (pango_font_metrics_get_ascent (metrics) +
-                         pango_font_metrics_get_descent (metrics));
-
-  pango_font_metrics_unref (metrics);
-
-  return retval;
-}
-
 MetaFrameType
 meta_frame_type_from_string (const char *str)
 {
diff --git a/src/ui/ui.c b/src/ui/ui.c
index 0b0f0a5..eb25cb9 100644
--- a/src/ui/ui.c
+++ b/src/ui/ui.c
@@ -25,7 +25,7 @@
 #include "util.h"
 #include "menu.h"
 #include "core.h"
-#include "theme-private.h"
+#include "theme.h"
 
 #include <string.h>
 #include <stdlib.h>