liz/rawTherapee
liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3992 from Benitoite/dev

Browse Source 
Font too large on Apple Retina/HiDPI & default font erroneously set to None
This commit is contained in:
Jean-Christophe 2017-08-02 22:39:07 +02:00 committed by GitHub
commit 9a3ac4ee8b
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rtdata/options/options.osx
View File

@ -23,9 +23,6 @@ PathTemplate=%p1/converted/%f
# Parameters: <Path to raw/JPG> <Path to default profile> <fNumber> <expose in seconds> <focal length in mm> <ISO> <Lens> <Camera>
CustomProfileBuilder=
[GUI]
Font=Sans 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
@ -39,3 +36,7 @@ Font=Sans 12
# Default profile name (without extension) to use for standard (8bits) images
#ImgDefault=Neutral
[GUI]
FontFamily=Helvetica Regular
CPFontFamily=Helvetica Regular

6
rtgui/main.cc
View File

@ -254,6 +254,12 @@ 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__)
// 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<Glib::Regex> 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)) {