frames: Use title style to set up title layout

Sounds obvious, doesn't it?

After this change when titlebar-uses-system-font is set, the "system
font" used will not be a generic one, but match what GTK+ uses in
client-side decorations.

https://bugzilla.gnome.org/show_bug.cgi?id=741917
This commit is contained in:
Florian Müllner
2014-09-25 06:44:45 +02:00
committed by Jasper St. Pierre
parent 2db71e73b4
commit 89a371ec98
4 changed files with 36 additions and 67 deletions

View File

@@ -416,21 +416,16 @@ meta_frames_ensure_layout (MetaFrames *frames,
{
gpointer key, value;
PangoFontDescription *font_desc;
double scale;
int size;
scale = meta_theme_get_title_scale (meta_theme_get_current (),
type,
flags);
frame->layout = gtk_widget_create_pango_layout (widget, frame->title);
pango_layout_set_ellipsize (frame->layout, PANGO_ELLIPSIZE_END);
pango_layout_set_auto_dir (frame->layout, FALSE);
pango_layout_set_single_paragraph_mode (frame->layout, TRUE);
font_desc = meta_gtk_widget_get_font_desc (widget, scale,
meta_prefs_get_titlebar_font ());
font_desc = meta_style_info_create_font_desc (frame->style_info);
meta_frame_style_apply_scale (style, font_desc);
size = pango_font_description_get_size (font_desc);