CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-02-01 01:03:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

win32: also use current monitor for regular fullscreen

Browse Source
This commit is contained in:
OV2 2012-10-11 22:32:31 +02:00
parent 174d17b1a2
commit 0db21ccac1
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gfx/context/wgl_ctx.c
View File

@ -210,7 +210,7 @@ static bool gfx_ctx_init(void)
return true;
}
static bool set_fullscreen(unsigned width, unsigned height)
static bool set_fullscreen(unsigned width, unsigned height, TCHAR *dev_name)
{
DEVMODE devmode;
memset(&devmode, 0, sizeof(devmode));
@ -219,8 +219,8 @@ static bool set_fullscreen(unsigned width, unsigned height)
devmode.dmPelsHeight = height;
devmode.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT;
RARCH_LOG("[WGL]: Setting fullscreen to %ux%u.\n", width, height);
return ChangeDisplaySettings(&devmode, CDS_FULLSCREEN) == DISP_CHANGE_SUCCESSFUL;
RARCH_LOG("[WGL]: Setting fullscreen to %ux%u on device %s.\n", width, height, dev_name);
return ChangeDisplaySettingsEx(dev_name, &devmode, NULL, CDS_FULLSCREEN, NULL) == DISP_CHANGE_SUCCESSFUL;
}
static void show_cursor(bool show)
@ -238,11 +238,11 @@ static bool gfx_ctx_set_video_mode(
(void)bits;
DWORD style;
MONITORINFO current_mon = {0};
current_mon.cbSize = sizeof(MONITORINFO);
MONITORINFOEX current_mon = {0};
current_mon.cbSize = sizeof(MONITORINFOEX);
if (!g_last_hm)
g_last_hm = MonitorFromWindow(GetDesktopWindow(), MONITOR_DEFAULTTONEAREST);
GetMonitorInfo(g_last_hm, &current_mon);
GetMonitorInfo(g_last_hm, (MONITORINFO *)&current_mon);
g_resize_width = width;
g_resize_height = height;
@ -260,9 +260,11 @@ static bool gfx_ctx_set_video_mode(
{
style = WS_POPUP | WS_VISIBLE;
if (!set_fullscreen(width, height))
if (!set_fullscreen(width, height, current_mon.szDevice))
goto error;
// display settings might have changed, get new coordinates
GetMonitorInfo(g_last_hm, (MONITORINFO *)&current_mon);
g_restore_desktop = true;
}
}
@ -278,8 +280,8 @@ static bool gfx_ctx_set_video_mode(
}
g_hwnd = CreateWindowEx(0, "RetroArch", "RetroArch", style,
fullscreen && windowed_full ? current_mon.rcMonitor.left : CW_USEDEFAULT,
fullscreen && windowed_full ? current_mon.rcMonitor.top : CW_USEDEFAULT,
fullscreen ? current_mon.rcMonitor.left : CW_USEDEFAULT,
fullscreen ? current_mon.rcMonitor.top : CW_USEDEFAULT,
width, height,
NULL, NULL, NULL, NULL);