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

Fix window iconize/deiconize when multiple screens with distinct scaling factors.

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12357 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy 2017-07-27 08:30:20 +00:00
parent 6b24b20966
commit 813bc06b19
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Fl_win32.cxx
View File

@ -1116,7 +1116,7 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar
//fl_msg.lPrivate = ???
Fl_Window *window = fl_find(hWnd);
float scale = Fl_Graphics_Driver::default_driver().scale();
float scale = window ? Fl::screen_driver()->scale(window->driver()->screen_num()) : Fl_Graphics_Driver::default_driver().scale();
if (window) switch (uMsg) {
@ -1454,6 +1454,10 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar
resize_bug_fix = window;
int nx = LOWORD(lParam);
int ny = HIWORD(lParam);
bool iconized = (nx >= 0x8000 && ny >= 0x8000);
if (iconized) {
break;
}
if (nx & 0x8000) nx -= 65536;
if (ny & 0x8000) ny -= 65536;
//fprintf(LOG,"WM_MOVE position(%d,%d) s=%.2f\n",int(nx/scale),int(ny/scale),scale);