libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-02-09 02:48:54 +00:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity

Slight adjustments to WGL.

Browse Source
This commit is contained in:
Themaister 2012-10-10 23:52:59 +02:00
parent 7f0f6bc0a7
commit 6e1b2c6291
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gfx/context/wgl_ctx.c
View File

@ -214,6 +214,7 @@ static bool set_fullscreen(unsigned width, unsigned height)
devmode.dmPelsHeight = height; devmode.dmPelsHeight = height;
devmode.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT; 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; return ChangeDisplaySettings(&devmode, CDS_FULLSCREEN) == DISP_CHANGE_SUCCESSFUL;
} }
@ -233,16 +234,14 @@ static bool gfx_ctx_set_video_mode(
bool windowed_full = g_settings.video.windowed_fullscreen; bool windowed_full = g_settings.video.windowed_fullscreen;
if (fullscreen) if (fullscreen)
{ {
if (windowed_full) style = WS_EX_TOPMOST | WS_POPUP | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN;
style = WS_EX_TOPMOST | WS_POPUP;
else AdjustWindowRect(&screen_rect, style, FALSE);
width = screen_rect.right - screen_rect.left;
height = screen_rect.bottom - screen_rect.top;
if (!windowed_full)
{ {
style = WS_POPUP | WS_VISIBLE;
AdjustWindowRect(&screen_rect, style, FALSE);
width = screen_rect.right - screen_rect.left;
height = screen_rect.bottom - screen_rect.top;
if (!set_fullscreen(width, height)) if (!set_fullscreen(width, height))
goto error; goto error;
@ -251,7 +250,7 @@ static bool gfx_ctx_set_video_mode(
} }
else else
{ {
style = WS_OVERLAPPEDWINDOW; style = WS_OVERLAPPEDWINDOW | WS_CLIPSIBLINGS | WS_CLIPCHILDREN;
RECT rect = {0}; RECT rect = {0};
rect.right = width; rect.right = width;
rect.bottom = height; rect.bottom = height;
@ -260,8 +259,10 @@ static bool gfx_ctx_set_video_mode(
height = rect.bottom - rect.top; height = rect.bottom - rect.top;
} }
int coord = windowed_full ? 0 : CW_USEDEFAULT;
g_hwnd = CreateWindowEx(0, "RetroArch", "RetroArch", style, g_hwnd = CreateWindowEx(0, "RetroArch", "RetroArch", style,
windowed_full ? 0 : CW_USEDEFAULT, windowed_full ? 0 : CW_USEDEFAULT, coord, coord,
width, height, width, height,
NULL, NULL, NULL, NULL); NULL, NULL, NULL, NULL);
@ -270,9 +271,11 @@ static bool gfx_ctx_set_video_mode(
gfx_ctx_update_window_title(true); gfx_ctx_update_window_title(true);
if (fullscreen)
ShowCursor(FALSE);
if (!fullscreen || windowed_full) if (!fullscreen || windowed_full)
{ {
ShowCursor(FALSE);
ShowWindow(g_hwnd, SW_RESTORE); ShowWindow(g_hwnd, SW_RESTORE);
UpdateWindow(g_hwnd); UpdateWindow(g_hwnd);
SetForegroundWindow(g_hwnd); SetForegroundWindow(g_hwnd);