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

Suppress baseDPI and baseHiDPI hardcoded values

Browse Source 
Should fix the issue reported here :
https://discuss.pixls.us/t/test-rawtherapee-5-6-rc1/12073/13
This commit is contained in:
Hombre57
2019-04-11 22:23:07 +02:00
parent bb58e65ffc
commit d01d99481d
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rtgui/rtwindow.cc
View File

@@ -109,7 +109,7 @@ RTWindow::RTWindow ()
#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.);
screen->set_resolution (RTScalable::baseDPI);
#endif
Glib::RefPtr<Glib::Regex> regex = Glib::Regex::create (THEMEREGEXSTR, Glib::RegexCompileFlags::REGEX_CASELESS);
@@ -184,15 +184,15 @@ RTWindow::RTWindow ()
int resolution = (int)style->get_screen()->get_resolution();
if (isPix) {
// HOMBRE: guessing here...
// if resolution is lower than 192ppi, we're supposing that it's already expressed in a scale==1 scenario
// if resolution is lower than baseHiDPI, we're supposing that it's already expressed in a scale==1 scenario
if (resolution >= int(RTScalable::baseHiDPI)) {
// converting the resolution to a scale==1 scenario
resolution /= 2;
}
// 1pt = 1/72in @ 96 ppi
// HOMBRE: If the font unit is px, is it already scaled up to match the resolution ?
// px >inch >pt >"scaled pt"
pt = (int)(double(fontSize) / RTScalable::baseDPI * 72. * (RTScalable::baseHiDPI / resolution) + 0.49);
// px >inch >pt >"scaled pt"
pt = (int)(double(fontSize) / RTScalable::baseDPI * 72. * (RTScalable::baseDPI / resolution) + 0.49);
} else {
pt = fontSize / Pango::SCALE;
}