mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove the 'defined(WIN32)' and 'defined(__APPLE__)' preprocessor directives introduced at r.12239

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12247 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy 2017-06-01 17:41:42 +00:00
parent 0960d07315
commit 12fd93485f
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Fl_Screen_Driver.cxx
View File

@ -355,8 +355,6 @@ int Fl_Screen_Driver::input_widget_handle_key(int key, unsigned mods, unsigned s
}
#if defined(FLTK_HIDPI_SUPPORT) || !(defined(WIN32) || defined(__APPLE__))
void Fl_Screen_Driver::rescale_all_windows_from_screen(int screen, float f)
{
float old_f = this->scale(screen);
@ -482,22 +480,18 @@ int Fl_Screen_Driver::scale_handler(int event)
return 0;
}
#endif // FLTK_HIDPI_SUPPORT
// determine the scaling value used at startup time (helps supporting HiDPI displays)
float Fl_Screen_Driver::default_scale_factor()
{
float factor = 1;
#if defined(FLTK_HIDPI_SUPPORT) || !(defined(WIN32) || defined(__APPLE__))
char *p = 0;
if ((p = getenv("FLTK_SCALING_FACTOR"))) {
if ((p = fl_getenv("FLTK_SCALING_FACTOR"))) {
sscanf(p, "%f", &factor);
}
else {
factor = desktop_scale_factor();
}
#endif // FLTK_HIDPI_SUPPORT
return factor;
}
@ -511,9 +505,7 @@ void Fl_Screen_Driver::open_display()
if (rescalable()) {
float factor = default_scale_factor();
for (int i = 0; i < screen_count(); i++) scale(i, factor);
#if defined(FLTK_HIDPI_SUPPORT) || !(defined(WIN32) || defined(__APPLE__))
Fl::add_handler(Fl_Screen_Driver::scale_handler);
#endif
Fl_Graphics_Driver::default_driver().scale(factor);
}
}

7
src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.H
View File

@ -78,8 +78,11 @@ public:
virtual void disable_im();
virtual void open_display_platform();
virtual void offscreen_size(Fl_Offscreen off, int &width, int &height);
virtual APP_SCALING_CAPABILITY rescalable() { return SYSTEMWIDE_APP_SCALING; }
#if defined(FLTK_HIDPI_SUPPORT)
virtual APP_SCALING_CAPABILITY rescalable() {
return SYSTEMWIDE_APP_SCALING;
}
#endif
virtual float scale(int n) {return scale_;}
virtual void scale(int n, float f) { scale_ = f;}
virtual float desktop_scale_factor();