From 8e13d469d8888d720199bedc38fcacf940a34d29 Mon Sep 17 00:00:00 2001 From: Benitoite Date: Wed, 26 Jul 2017 09:38:54 -0700 Subject: [PATCH 1/4] Uses FontFamily= and FontSize= instead of Font= https://github.com/Beep6581/RawTherapee/issues/3984 --- rtdata/options/options.osx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rtdata/options/options.osx b/rtdata/options/options.osx index 4d35255cd..54beadb25 100644 --- a/rtdata/options/options.osx +++ b/rtdata/options/options.osx @@ -24,7 +24,8 @@ PathTemplate=%p1/converted/%f CustomProfileBuilder= [GUI] -Font=Sans 12 +FontFamily=Arial Regular +FontSize=12 # Set here an absolute or relative path (to the rawtherapee.exe file) to the directory containing your own profiles. # If MultiUser=true, each user will have their own "options" file, and can set a common or different absolu path From 1c006d147288ac4d2a85bc73a5203bc7829983b3 Mon Sep 17 00:00:00 2001 From: Benitoite Date: Fri, 28 Jul 2017 09:39:25 -0700 Subject: [PATCH 2/4] macOS reports and sets screen resolution https://github.com/Beep6581/RawTherapee/issues/3984#issuecomment-318476962 --- rtgui/main.cc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/rtgui/main.cc b/rtgui/main.cc index 099751f06..5a0322973 100644 --- a/rtgui/main.cc +++ b/rtgui/main.cc @@ -254,6 +254,15 @@ RTWindow *create_rt_window() Gtk::Settings::get_for_screen(screen)->property_gtk_theme_name() = "Adwaita"; Gtk::Settings::get_for_screen(screen)->property_gtk_application_prefer_dark_theme() = true; +#if defined(__APPLE__) + double resolution = screen->get_resolution (); + printf("Screen resolution is %.1f", (float)resolution); + + // This will force screen resolution regarding font, but I don't think it's compliant with Gtk guidelines... + // Do not confuse with screen scaling, where everything is scaled up ! + screen->set_resolution (96.); +#endif + Glib::RefPtr regex = Glib::Regex::create(THEMEREGEXSTR, Glib::RegexCompileFlags::REGEX_CASELESS); Glib::ustring filename = Glib::build_filename(argv0, "themes", options.theme + ".css"); if (!regex->match(options.theme + ".css") || !Glib::file_test(filename, Glib::FILE_TEST_EXISTS)) { From 02cf9e3b1270a8d3de4eb9c7865b98cd4dabbeb5 Mon Sep 17 00:00:00 2001 From: Benitoite Date: Fri, 28 Jul 2017 09:44:11 -0700 Subject: [PATCH 3/4] FontFamily= & CPFontFamily= https://github.com/Beep6581/RawTherapee/issues/3984#issuecomment-318476962 --- rtdata/options/options.osx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rtdata/options/options.osx b/rtdata/options/options.osx index 54beadb25..25696cb85 100644 --- a/rtdata/options/options.osx +++ b/rtdata/options/options.osx @@ -23,10 +23,6 @@ PathTemplate=%p1/converted/%f # Parameters: CustomProfileBuilder= -[GUI] -FontFamily=Arial Regular -FontSize=12 - # Set here an absolute or relative path (to the rawtherapee.exe file) to the directory containing your own profiles. # If MultiUser=true, each user will have their own "options" file, and can set a common or different absolu path #Directory=profiles @@ -40,3 +36,7 @@ FontSize=12 # Default profile name (without extension) to use for standard (8bits) images #ImgDefault=Neutral + +[GUI] +FontFamily=Helvetica Regular +CPFontFamily=Helvetica Regular From 7e05ea8827d59fa397312332ffcac2c56df211ef Mon Sep 17 00:00:00 2001 From: Benitoite Date: Wed, 2 Aug 2017 12:21:28 -0700 Subject: [PATCH 4/4] Update main.cc --- rtgui/main.cc | 3 --- 1 file changed, 3 deletions(-) diff --git a/rtgui/main.cc b/rtgui/main.cc index 5a0322973..10cbe72b1 100644 --- a/rtgui/main.cc +++ b/rtgui/main.cc @@ -255,9 +255,6 @@ RTWindow *create_rt_window() Gtk::Settings::get_for_screen(screen)->property_gtk_application_prefer_dark_theme() = true; #if defined(__APPLE__) - double resolution = screen->get_resolution (); - printf("Screen resolution is %.1f", (float)resolution); - // This will force screen resolution regarding font, but I don't think it's compliant with Gtk guidelines... // Do not confuse with screen scaling, where everything is scaled up ! screen->set_resolution (96.);