AuroraMiddleware/glfw
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Win32: Fix and simplify work area retrieval

Browse Source 
Related to #1322.
This commit is contained in:
Doug Binks 2018-09-08 17:09:43 +02:00 committed by Camilla Löwy
parent c733ab0a22
commit 5c752355cb
1 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/win32_monitor.c
View File

@ -361,35 +361,26 @@ void _glfwPlatformGetMonitorContentScale(_GLFWmonitor* monitor,
_glfwGetMonitorContentScaleWin32(monitor->win32.handle, xscale, yscale); _glfwGetMonitorContentScaleWin32(monitor->win32.handle, xscale, yscale);
} }
static BOOL CALLBACK MonitorEnumProc(HMONITOR hMonitor, HDC hdcMonitor, LPRECT lprcMonitor, LPARAM dwData)
{
RECT *workarea = (RECT *)dwData;
MONITORINFO monitorInfo;
monitorInfo.cbSize = sizeof(MONITORINFO);
GetMonitorInfo(hMonitor, &monitorInfo);
workarea->left = monitorInfo.rcWork.left;
workarea->top = monitorInfo.rcWork.top;
workarea->right = monitorInfo.rcWork.right;
workarea->bottom = monitorInfo.rcWork.bottom;
return TRUE;
}
void _glfwPlatformGetMonitorWorkarea(_GLFWmonitor* monitor, int* xpos, int* ypos, int *width, int *height) void _glfwPlatformGetMonitorWorkarea(_GLFWmonitor* monitor, int* xpos, int* ypos, int *width, int *height)
{ {
HDC dc; MONITORINFO monitorInfo;
RECT workarea; int x, y;
POINT pointInMonitor;
HMONITOR hMonitor;
dc = CreateDCW(L"DISPLAY", monitor->win32.adapterName, NULL, NULL); _glfwPlatformGetMonitorPos( monitor, &x, &y );
if (!EnumDisplayMonitors(dc, NULL, MonitorEnumProc, (LPARAM)&workarea)) monitorInfo.cbSize = sizeof(MONITORINFO);
return; pointInMonitor.x = x + 1;
pointInMonitor.y = y + 1;
DeleteDC(dc); hMonitor = MonitorFromPoint( pointInMonitor, 0 );
GetMonitorInfo(hMonitor, &monitorInfo);
*xpos = workarea.left; *xpos = monitorInfo.rcWork.left;
*ypos = workarea.top; *ypos = monitorInfo.rcWork.top;
*width = workarea.right; *width = monitorInfo.rcWork.right - monitorInfo.rcWork.left;
*height = workarea.bottom; *height = monitorInfo.rcWork.bottom - monitorInfo.rcWork.top;
} }
GLFWvidmode* _glfwPlatformGetVideoModes(_GLFWmonitor* monitor, int* count) GLFWvidmode* _glfwPlatformGetVideoModes(_GLFWmonitor* monitor, int* count)