Merge commit 'refs/merge-requests/16' of https://gitorious.org/solvespace/solvespace

pull/3/head
Jonathan Westhues 2015-03-10 22:50:31 -07:00
commit 9c9a0d8c28
1 changed files with 10 additions and 2 deletions

View File

@ -108,8 +108,16 @@ void ThawWindowPosF(HWND hwnd, const char *subKey, const char *name)
if(v) if(v)
ShowWindow(hwnd, SW_MAXIMIZE); ShowWindow(hwnd, SW_MAXIMIZE);
RECT dr;
GetWindowRect(GetDesktopWindow(), &dr); HMONITOR hMonitor;
MONITORINFO mi;
RECT dr;
hMonitor = MonitorFromRect(&r, MONITOR_DEFAULTTONEAREST);
mi.cbSize = sizeof(mi);
GetMonitorInfo(hMonitor, &mi);
dr = mi.rcMonitor;
// If it somehow ended up off-screen, then put it back. // If it somehow ended up off-screen, then put it back.
Clamp(&(r.left), dr.left, dr.right); Clamp(&(r.left), dr.left, dr.right);