diff options
| -rw-r--r-- | src/Fl_win32.cxx | 4 | ||||
| -rw-r--r-- | src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx index 30e01c0ea..d54504c03 100644 --- a/src/Fl_win32.cxx +++ b/src/Fl_win32.cxx @@ -2498,7 +2498,7 @@ void Fl_WinAPI_Window_Driver::capture_titlebar_and_borders(Fl_Shared_Image*& top if (htop) { r_top = dr->read_win_rectangle_unscaled(NULL, r.left, r.top, r.right - r.left, htop, 0); top = Fl_Shared_Image::get(r_top); - if (DWMscaling >= 1.1) top->scale(ww, htop/DWMscaling, 0, 1); + if (DWMscaling != 1) top->scale(ww, htop/DWMscaling, 0, 1); } if (wsides) { r_left = dr->read_win_rectangle_unscaled(NULL, r.left, r.top + htop, wsides, h()*scaling, 0); @@ -2507,7 +2507,7 @@ void Fl_WinAPI_Window_Driver::capture_titlebar_and_borders(Fl_Shared_Image*& top right = Fl_Shared_Image::get(r_right); r_bottom = dr->read_win_rectangle_unscaled(NULL, r.left, r.bottom-hbottom, ww, hbottom, 0); bottom = Fl_Shared_Image::get(r_bottom); - if (scaling >= 1.1) { + if (scaling != 1) { left->scale(wsides, h(), 0, 1); right->scale(wsides, h(), 0, 1); bottom->scale(ww, hbottom, 0, 1); diff --git a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx index e39a2ed5a..24a330183 100644 --- a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx +++ b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx @@ -75,12 +75,11 @@ RECT // frame of the decorated window in screen coordinates static DwmGetWindowAttribute_type DwmGetWindowAttribute = dwmapi_dll ? (DwmGetWindowAttribute_type)GetProcAddress(dwmapi_dll, "DwmGetWindowAttribute") : NULL; int need_r = 1; - float scaling = 1; + float scaling = ((Fl_WinAPI_Screen_Driver*)Fl::screen_driver())->DWM_scaling_factor(screen_num()); if (DwmGetWindowAttribute) { const DWORD DWMWA_EXTENDED_FRAME_BOUNDS = 9; if ( DwmGetWindowAttribute(fl_xid(win), DWMWA_EXTENDED_FRAME_BOUNDS, &r, sizeof(RECT)) == S_OK ) { need_r = 0; - scaling = ((Fl_WinAPI_Screen_Driver*)Fl::screen_driver())->DWM_scaling_factor(screen_num()); } } if (need_r) { |