diff options
Diffstat (limited to 'src/ui/ui.c')
| -rw-r--r-- | src/ui/ui.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/ui/ui.c b/src/ui/ui.c index 9a7f255e..f4bee09d 100644 --- a/src/ui/ui.c +++ b/src/ui/ui.c @@ -675,14 +675,17 @@ meta_ui_theme_get_frame_borders (MetaUI *ui, if (meta_ui_have_a_theme ()) { + GdkDisplay *display = gdk_x11_lookup_xdisplay (ui->xdisplay); + GdkScreen *screen = gdk_display_get_screen (display, XScreenNumberOfScreen (ui->xscreen)); + MetaStyleInfo *style_info = NULL; + + style_info = meta_theme_create_style_info (screen, NULL); + context = gtk_widget_get_pango_context (GTK_WIDGET (ui->frames)); font_desc = meta_prefs_get_titlebar_font (); if (!font_desc) { - GdkDisplay *display = gdk_x11_lookup_xdisplay (ui->xdisplay); - GdkScreen *screen = gdk_display_get_screen (display, XScreenNumberOfScreen (ui->xscreen)); - if (meta_prefs_get_theme ()) { GtkStyleContext *style = NULL; @@ -704,13 +707,7 @@ meta_ui_theme_get_frame_borders (MetaUI *ui, } else { - MetaStyleInfo *style_info = NULL; - - style_info = meta_theme_create_style_info (screen, NULL); free_font_desc = meta_style_info_create_font_desc (style_info); - - if (style_info != NULL) - meta_style_info_unref (style_info); } font_desc = (const PangoFontDescription *) free_font_desc; @@ -719,11 +716,15 @@ meta_ui_theme_get_frame_borders (MetaUI *ui, text_height = meta_pango_font_desc_get_text_height (font_desc, context); meta_theme_get_frame_borders (meta_theme_get_current (), + style_info, type, text_height, flags, borders); if (free_font_desc) pango_font_description_free (free_font_desc); + + if (style_info != NULL) + meta_style_info_unref (style_info); } else { |