[metacity] theme: move meta_style_info_create_font_desc to libmetacity
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [metacity] theme: move meta_style_info_create_font_desc to libmetacity
- Date: Wed, 3 Feb 2016 23:05:49 +0000 (UTC)
commit 1ec1849e202687298af71f5f480456585adaac08
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Wed Feb 3 22:11:01 2016 +0200
theme: move meta_style_info_create_font_desc to libmetacity
libmetacity/meta-theme.c | 29 +++++++++++++++++++++++------
libmetacity/meta-theme.h | 41 +++++++++++++++++++++--------------------
src/ui/theme-private.h | 3 ---
src/ui/theme.c | 25 -------------------------
4 files changed, 44 insertions(+), 54 deletions(-)
---
diff --git a/libmetacity/meta-theme.c b/libmetacity/meta-theme.c
index bad12d5..86818fe 100644
--- a/libmetacity/meta-theme.c
+++ b/libmetacity/meta-theme.c
@@ -280,12 +280,6 @@ meta_theme_set_titlebar_font (MetaTheme *theme,
theme->titlebar_font = pango_font_description_copy (titlebar_font);
}
-const PangoFontDescription *
-meta_theme_get_titlebar_font (MetaTheme *theme)
-{
- return theme->titlebar_font;
-}
-
MetaThemeType
meta_theme_get_theme_type (MetaTheme *theme)
{
@@ -389,6 +383,29 @@ meta_theme_get_frame_style (MetaTheme *theme,
return style;
}
+PangoFontDescription*
+meta_style_info_create_font_desc (MetaTheme *theme,
+ MetaStyleInfo *style_info)
+{
+ GtkStyleContext *context;
+ PangoFontDescription *font_desc;
+
+ context = style_info->styles[META_STYLE_ELEMENT_TITLE];
+
+ gtk_style_context_save (context);
+ gtk_style_context_set_state (context, GTK_STATE_FLAG_NORMAL);
+
+ gtk_style_context_get (context, GTK_STATE_FLAG_NORMAL,
+ "font", &font_desc, NULL);
+
+ gtk_style_context_restore (context);
+
+ if (theme->titlebar_font)
+ pango_font_description_merge (font_desc, theme->titlebar_font, TRUE);
+
+ return font_desc;
+}
+
gboolean
meta_theme_allows_shade_stick_above_buttons (MetaTheme *theme)
{
diff --git a/libmetacity/meta-theme.h b/libmetacity/meta-theme.h
index ca7a21b..d1b38a8 100644
--- a/libmetacity/meta-theme.h
+++ b/libmetacity/meta-theme.h
@@ -152,38 +152,39 @@ struct _MetaFrameGeometry
guint bottom_right_corner_rounded_radius;
};
-GQuark meta_theme_error_quark (void);
+GQuark meta_theme_error_quark (void);
-MetaTheme *meta_theme_new (MetaThemeType type);
+MetaTheme *meta_theme_new (MetaThemeType type);
-gboolean meta_theme_load (MetaTheme *theme,
- const gchar *theme_name,
- GError **error);
+gboolean meta_theme_load (MetaTheme *theme,
+ const gchar *theme_name,
+ GError **error);
-void meta_theme_style_invalidate (MetaTheme *theme);
+void meta_theme_style_invalidate (MetaTheme *theme);
-MetaStyleInfo *meta_theme_get_style_info (MetaTheme *theme,
- const gchar *variant);
+MetaStyleInfo *meta_theme_get_style_info (MetaTheme *theme,
+ const gchar *variant);
-void meta_theme_set_composited (MetaTheme *theme,
- gboolean composited);
+void meta_theme_set_composited (MetaTheme *theme,
+ gboolean composited);
-gboolean meta_theme_get_composited (MetaTheme *theme);
+gboolean meta_theme_get_composited (MetaTheme *theme);
-void meta_theme_set_titlebar_font (MetaTheme *theme,
- const PangoFontDescription *titlebar_font);
+void meta_theme_set_titlebar_font (MetaTheme *theme,
+ const PangoFontDescription *titlebar_font);
-const PangoFontDescription *meta_theme_get_titlebar_font (MetaTheme *theme);
+MetaThemeType meta_theme_get_theme_type (MetaTheme *theme);
-MetaThemeType meta_theme_get_theme_type (MetaTheme *theme);
+gchar *meta_theme_get_name (MetaTheme *theme);
-gchar *meta_theme_get_name (MetaTheme *theme);
+MetaFrameStyle *meta_theme_get_frame_style (MetaTheme *theme,
+ MetaFrameType type,
+ MetaFrameFlags flags);
-MetaFrameStyle *meta_theme_get_frame_style (MetaTheme *theme,
- MetaFrameType type,
- MetaFrameFlags flags);
+PangoFontDescription *meta_style_info_create_font_desc (MetaTheme *theme,
+ MetaStyleInfo *style_info);
-gboolean meta_theme_allows_shade_stick_above_buttons (MetaTheme *theme);
+gboolean meta_theme_allows_shade_stick_above_buttons (MetaTheme *theme);
G_END_DECLS
diff --git a/src/ui/theme-private.h b/src/ui/theme-private.h
index cf086dc..41eac18 100644
--- a/src/ui/theme-private.h
+++ b/src/ui/theme-private.h
@@ -22,9 +22,6 @@
G_BEGIN_DECLS
-PangoFontDescription *meta_style_info_create_font_desc (MetaTheme *theme,
- MetaStyleInfo *style_info);
-
int meta_pango_font_desc_get_text_height (const PangoFontDescription *font_desc,
PangoContext *context);
diff --git a/src/ui/theme.c b/src/ui/theme.c
index 037e481..a1705bc 100644
--- a/src/ui/theme.c
+++ b/src/ui/theme.c
@@ -1587,31 +1587,6 @@ meta_theme_get_title_scale (MetaTheme *theme,
return style->layout->title_scale;
}
-PangoFontDescription*
-meta_style_info_create_font_desc (MetaTheme *theme,
- MetaStyleInfo *style_info)
-{
- GtkStyleContext *context;
- PangoFontDescription *font_desc;
- const PangoFontDescription *titlebar_font;
-
- context = style_info->styles[META_STYLE_ELEMENT_TITLE];
-
- gtk_style_context_save (context);
- gtk_style_context_set_state (context, GTK_STATE_FLAG_NORMAL);
-
- gtk_style_context_get (context, GTK_STATE_FLAG_NORMAL,
- "font", &font_desc, NULL);
-
- gtk_style_context_restore (context);
-
- titlebar_font = meta_theme_get_titlebar_font (theme);
- if (titlebar_font)
- pango_font_description_merge (font_desc, titlebar_font, TRUE);
-
- return font_desc;
-}
-
void
meta_theme_draw_frame (MetaTheme *theme,
const gchar *theme_variant,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]