HiDPI support under WIN32 platform: completed.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12285 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

1 files changed, 9 insertions, 1 deletions

diff --git a/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.cxx b/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.cxx
index 236a33288..5951ba193 100644
--- a/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.cxx
+++ b/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.cxx
@@ -100,7 +100,7 @@ BOOL Fl_WinAPI_Screen_Driver::screen_cb(HMONITOR mon, HDC, LPRECT r)
     screens[num_screens] = mi.rcMonitor;
     // If we also want to record the work area, we would also store mi.rcWork at this point
     work_area[num_screens] = mi.rcWork;
-    scale_of_screen[num_screens] = 1;
+//extern FILE*LOG;fprintf(LOG,"screen_cb ns=%d\n",num_screens);fflush(LOG);
     /*fl_alert("screen %d %d,%d,%d,%d work %d,%d,%d,%d",num_screens,
     screens[num_screens].left,screens[num_screens].right,screens[num_screens].top,screens[num_screens].bottom,
     work_area[num_screens].left,work_area[num_screens].right,work_area[num_screens].top,work_area[num_screens].bottom);
@@ -141,6 +141,9 @@ void Fl_WinAPI_Screen_Driver::init()
         //      NOTE: num_screens is incremented in screen_cb so we must first reset it here...
         num_screens = 0;
         fl_edm(0, 0, screen_cb, (LPARAM)this);
+#ifdef FLTK_HIDPI_SUPPORT
+        init_screen_scale_factors();
+#endif
         return;
       }
     }
@@ -157,6 +160,11 @@ void Fl_WinAPI_Screen_Driver::init()
 }
 
 
+float Fl_WinAPI_Screen_Driver::desktop_scale_factor() {
+  return 0; //indicates each screen has already been assigned its scale factor value
+}
+
+
 void Fl_WinAPI_Screen_Driver::screen_work_area(int &X, int &Y, int &W, int &H, int n)
 {
   if (num_screens < 0) init();