Merge set_pango_fontsize() into reset_dpi()

… since reset_dpi() is the only caller.

diff --git a/gtk2_ardour/ui_config.cc b/gtk2_ardour/ui_config.cc
index c6e538bb1b68c0fe37270663c1b3aa7f70d8dc70..2db640681d4b219e9317affde2e85e7df59e9228 100644 (file)
--- 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 559c86a14837034854e4caa3308710d97c456115..2fac5e571dc9fa62b994b8c275e5da30f4be23cb 100644 (file)
--- 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 ();