mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-07 23:35:03 +01:00
Do not automatically set font-size on macOS
freetype on macOS does not scale fonts, font-scale and ui_scale have to remain at 100% otherwise other UI elements change size while the font does not.
This commit is contained in:
parent
870172611f
commit
560885b7da
2 changed files with 6 additions and 0 deletions
|
|
@ -216,9 +216,11 @@ static const gchar *_record_mode_strings[] = {
|
||||||
static bool
|
static bool
|
||||||
ask_about_configuration_copy (string const & old_dir, string const & new_dir, int version)
|
ask_about_configuration_copy (string const & old_dir, string const & new_dir, int version)
|
||||||
{
|
{
|
||||||
|
#ifndef __APPLE__
|
||||||
/* guess screen scaling */
|
/* guess screen scaling */
|
||||||
UIConfiguration::instance ().set_font_scale (1024 * guess_default_ui_scale ());
|
UIConfiguration::instance ().set_font_scale (1024 * guess_default_ui_scale ());
|
||||||
UIConfiguration::instance ().reset_dpi ();
|
UIConfiguration::instance ().reset_dpi ();
|
||||||
|
#endif
|
||||||
|
|
||||||
ArdourMessageDialog msg (string_compose (
|
ArdourMessageDialog msg (string_compose (
|
||||||
_("%1 %2.x has discovered configuration files from %1 %3.x.\n\n"
|
_("%1 %2.x has discovered configuration files from %1 %3.x.\n\n"
|
||||||
|
|
|
||||||
|
|
@ -645,6 +645,9 @@ ARDOUR_UI_UTILS::key_is_legal_for_numeric_entry (guint keyval)
|
||||||
int
|
int
|
||||||
ARDOUR_UI_UTILS::guess_default_ui_scale ()
|
ARDOUR_UI_UTILS::guess_default_ui_scale ()
|
||||||
{
|
{
|
||||||
|
#ifdef __APPLE__
|
||||||
|
return 100;
|
||||||
|
#else
|
||||||
gint width = 0;
|
gint width = 0;
|
||||||
gint height = 0;
|
gint height = 0;
|
||||||
GdkScreen* screen = gdk_display_get_screen (gdk_display_get_default (), 0);
|
GdkScreen* screen = gdk_display_get_screen (gdk_display_get_default (), 0);
|
||||||
|
|
@ -674,6 +677,7 @@ ARDOUR_UI_UTILS::guess_default_ui_scale ()
|
||||||
} else {
|
} else {
|
||||||
return 250;
|
return 250;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue