[metacity] theme: add MetaTheme parameter to meta_style_info_create_font_desc
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [metacity] theme: add MetaTheme parameter to meta_style_info_create_font_desc
- Date: Sat, 16 Jan 2016 17:29:00 +0000 (UTC)
commit ec6be7c579f246d4308cdb4332a5b07ea82c066a
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Sat Jan 16 17:55:15 2016 +0200
theme: add MetaTheme parameter to meta_style_info_create_font_desc
src/ui/frames.c | 2 +-
src/ui/theme.c | 3 ++-
src/ui/theme.h | 3 ++-
src/ui/ui.c | 2 +-
4 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/src/ui/frames.c b/src/ui/frames.c
index aa532c5..7d702bc 100644
--- a/src/ui/frames.c
+++ b/src/ui/frames.c
@@ -533,7 +533,7 @@ meta_frames_ensure_layout (MetaFrames *frames,
}
else
{
- font_desc = meta_style_info_create_font_desc (frame->style_info);
+ font_desc = meta_style_info_create_font_desc (current, frame->style_info);
meta_frame_style_apply_scale (style, font_desc);
}
diff --git a/src/ui/theme.c b/src/ui/theme.c
index 0b288ab..5a0dd4c 100644
--- a/src/ui/theme.c
+++ b/src/ui/theme.c
@@ -6197,7 +6197,8 @@ meta_style_info_set_flags (MetaStyleInfo *style_info,
}
PangoFontDescription*
-meta_style_info_create_font_desc (MetaStyleInfo *style_info)
+meta_style_info_create_font_desc (MetaTheme *theme,
+ MetaStyleInfo *style_info)
{
GtkStyleContext *context;
PangoFontDescription *font_desc;
diff --git a/src/ui/theme.h b/src/ui/theme.h
index 8560d82..f5754e6 100644
--- a/src/ui/theme.h
+++ b/src/ui/theme.h
@@ -1015,7 +1015,8 @@ void meta_style_info_unref (MetaStyleInfo *style_info);
void meta_style_info_set_flags (MetaStyleInfo *style_info,
MetaFrameFlags flags);
-PangoFontDescription* meta_style_info_create_font_desc (MetaStyleInfo *style_info);
+PangoFontDescription* meta_style_info_create_font_desc (MetaTheme *theme,
+ MetaStyleInfo *style_info);
void meta_theme_draw_frame (MetaTheme *theme,
MetaStyleInfo *style_info,
diff --git a/src/ui/ui.c b/src/ui/ui.c
index e8e3382..44344c5 100644
--- a/src/ui/ui.c
+++ b/src/ui/ui.c
@@ -708,7 +708,7 @@ meta_ui_theme_get_frame_borders (MetaUI *ui,
}
else
{
- free_font_desc = meta_style_info_create_font_desc (style_info);
+ free_font_desc = meta_style_info_create_font_desc (current, style_info);
}
font_desc = (const PangoFontDescription *) free_font_desc;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]