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

CSS now handled by RTWindow (instead of main)

Browse Source 
see #3547
This commit is contained in:
Hombre
2019-01-04 23:45:33 +01:00
parent 97824da6de
commit 4d77e44880
3 changed files with 160 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
rtgui/rtscalable.cc
View File

@@ -30,8 +30,8 @@ int RTScalable::scale = 0;
extern Glib::ustring argv0;
extern Options options;
extern unsigned char initialGdkScale;
extern float fontScale;
extern unsigned char scale;
Gtk::TextDirection RTScalable::direction = Gtk::TextDirection::TEXT_DIR_NONE;
void RTScalable::setDPInScale (const double newDPI, const int newScale)
@@ -41,8 +41,15 @@ void RTScalable::setDPInScale (const double newDPI, const int newScale)
scale = newScale;
// HOMBRE: On windows, if scale = 2, the dpi is non significant, i.e. should be considered = 192 ; don't know for linux/macos
dpi = newDPI;
if (scale == 2 && newDPI < 192) {
dpi *= 2;
if (scale == 1) {
if (dpi >= 192.) {
scale = 2;
}
}
else if (scale == 2) {
if (dpi < 192.) {
dpi *= 2.;
}
}
//printf("RTScalable::setDPInScale / New scale = %d & new DPI = %.3f (%.3f asked) -> Reloading all RTScalable\n", scale, dpi, newDPI);
}
@@ -70,7 +77,11 @@ Gtk::TextDirection RTScalable::getDirection()
void RTScalable::init(Gtk::Window *window)
{
setDPInScale(window->get_screen()->get_resolution(), ::scale);
dpi = 0.;
scale = 0;
printf("RTScalable::init / setDPInScale(scale:%d, DPI:%.3f)\n", rtengine::max((int)initialGdkScale, window->get_scale_factor()), window->get_screen()->get_resolution());
setDPInScale(window->get_screen()->get_resolution(), rtengine::max((int)initialGdkScale, window->get_scale_factor()));
direction = window->get_direction();
}