Merge set_pango_fontsize() into reset_dpi()
… since reset_dpi() is the only caller.
This commit is contained in:
parent
6588da09b3
commit
01ac1b5362
|
@ -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
|
||||
|
|
|
@ -86,7 +86,6 @@ private:
|
|||
sigc::signal<void> ColorsChanged;
|
||||
|
||||
void reset_dpi ();
|
||||
void set_pango_fontsize ();
|
||||
|
||||
float get_ui_scale ();
|
||||
|
||||
|
|
Loading…
Reference in New Issue