diff options
author | Julien "_FrnchFrgg_" RIVAUD <frnchfrgg@free.fr> | 2016-08-21 11:51:54 +0200 |
---|---|---|
committer | Julien "_FrnchFrgg_" RIVAUD <frnchfrgg@free.fr> | 2016-08-21 15:04:06 +0200 |
commit | 01ac1b5362b0f246e5227dc763054917daa43642 (patch) | |
tree | 3324fff1af3a09c9d78a56ca399a6a4a6dbef7fb | |
parent | 6588da09b393dc671ab6906f74f7a05b93581d8d (diff) |
Merge set_pango_fontsize() into reset_dpi()
… since reset_dpi() is the only caller.
-rw-r--r-- | gtk2_ardour/ui_config.cc | 18 | ||||
-rw-r--r-- | gtk2_ardour/ui_config.h | 1 |
2 files changed, 6 insertions, 13 deletions
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 @@ -160,18 +160,6 @@ 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(); /* FT2 rendering - used by GnomeCanvas, sigh */ @@ -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<void> ColorsChanged; void reset_dpi (); - void set_pango_fontsize (); float get_ui_scale (); |