From 01ac1b5362b0f246e5227dc763054917daa43642 Mon Sep 17 00:00:00 2001 From: "Julien \"_FrnchFrgg_\" RIVAUD" Date: Sun, 21 Aug 2016 11:51:54 +0200 Subject: Merge set_pango_fontsize() into reset_dpi() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit … since reset_dpi() is the only caller. --- gtk2_ardour/ui_config.cc | 18 ++++++------------ gtk2_ardour/ui_config.h | 1 - 2 files changed, 6 insertions(+), 13 deletions(-) (limited to 'gtk2_ardour') diff --git a/gtk2_ardour/ui_config.cc b/gtk2_ardour/ui_config.cc index c6e538bb1b..2db640681d 100644 --- a/gtk2_ardour/ui_config.cc +++ b/gtk2_ardour/ui_config.cc @@ -158,18 +158,6 @@ UIConfiguration::reset_gtk_theme () void UIConfiguration::reset_dpi () -{ - long val = get_font_scale(); - set_pango_fontsize (); - /* Xft rendering */ - - gtk_settings_set_long_property (gtk_settings_get_default(), - "gtk-xft-dpi", val, "ardour"); - DPIReset(); //Emit Signal -} - -void -UIConfiguration::set_pango_fontsize () { long val = get_font_scale(); @@ -182,6 +170,12 @@ UIConfiguration::set_pango_fontsize () /* Cairo rendering, in case there is any */ pango_cairo_font_map_set_resolution ((PangoCairoFontMap*) pango_cairo_font_map_get_default(), val/1024); + + /* Xft rendering */ + + gtk_settings_set_long_property (gtk_settings_get_default(), + "gtk-xft-dpi", val, "ardour"); + DPIReset(); //Emit Signal } float diff --git a/gtk2_ardour/ui_config.h b/gtk2_ardour/ui_config.h index 559c86a148..2fac5e571d 100644 --- a/gtk2_ardour/ui_config.h +++ b/gtk2_ardour/ui_config.h @@ -86,7 +86,6 @@ private: sigc::signal ColorsChanged; void reset_dpi (); - void set_pango_fontsize (); float get_ui_scale (); -- cgit v1.2.3