kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Apply multimonitor fix part of patch [#25612]

Browse Source 
Submitted by Alexander Kuznetsov
Fixes [#23630] Negative OS screen coords not stored/used
Reported by Mort (mnme)
This commit is contained in:
Nathan Letwory 2011-01-26 12:19:19 +00:00
parent 2f45cdb420
commit 75f155be33
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
intern/ghost/intern/GHOST_WindowWin32.cpp
View File

@ -141,31 +141,45 @@ GHOST_WindowWin32::GHOST_WindowWin32(
{
if (state != GHOST_kWindowStateFullScreen) {
RECT rect;
MONITORINFO monitor;
GHOST_TUns32 tw, th;
width += GetSystemMetrics(SM_CXSIZEFRAME)*2;
height += GetSystemMetrics(SM_CYSIZEFRAME)*2 + GetSystemMetrics(SM_CYCAPTION);
rect.left = left;
rect.right = left + width;
rect.top = top;
rect.bottom = top + height;
monitor.cbSize=sizeof(monitor);
monitor.dwFlags=0;
// take taskbar into account
SystemParametersInfo(SPI_GETWORKAREA,0,&rect,0);
th = rect.bottom - rect.top;
tw = rect.right - rect.left;
GetMonitorInfo(MonitorFromRect(&rect,MONITOR_DEFAULTTONEAREST),&monitor);
th = monitor.rcWork.bottom - monitor.rcWork.top;
tw = monitor.rcWork.right - monitor.rcWork.left;
if(tw < width)
{
width = tw;
left = rect.left;
left = monitor.rcWork.left;
}
else if(left < rect.left)
left = rect.left;
else if(monitor.rcWork.right < left + (int)width)
left = monitor.rcWork.right - width;
else if(left < monitor.rcWork.left)
left = monitor.rcWork.left;
if(th < height)
{
height = th;
top = rect.top;
top = monitor.rcWork.top;
}
else if(top < rect.top)
top = rect.top;
else if(monitor.rcWork.bottom < top + (int)height)
top = monitor.rcWork.bottom - height;
else if(top < monitor.rcWork.top)
top = monitor.rcWork.top;
m_hWnd = ::CreateWindow(
s_windowClassName, // pointer to registered class name