summaryrefslogtreecommitdiff
path: root/gtk2_ardour/ui_config.cc
diff options
context:
space:
mode:
authorJulien "_FrnchFrgg_" RIVAUD <frnchfrgg@free.fr>2016-08-21 11:51:54 +0200
committerJulien "_FrnchFrgg_" RIVAUD <frnchfrgg@free.fr>2016-08-21 15:04:06 +0200
commit01ac1b5362b0f246e5227dc763054917daa43642 (patch)
tree3324fff1af3a09c9d78a56ca399a6a4a6dbef7fb /gtk2_ardour/ui_config.cc
parent6588da09b393dc671ab6906f74f7a05b93581d8d (diff)
Merge set_pango_fontsize() into reset_dpi()
… since reset_dpi() is the only caller.
Diffstat (limited to 'gtk2_ardour/ui_config.cc')
-rw-r--r--gtk2_ardour/ui_config.cc18
1 files changed, 6 insertions, 12 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