CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-15 23:06:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Restore resolution fix

Browse Source
This commit is contained in:
alphanu1 2018-04-28 20:52:58 +01:00 committed by GitHub
parent 6aa072b6cf
commit b51c8d62e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gfx/display_servers/dispserv_null.c
View File

@ -50,7 +50,6 @@ const video_display_server_t dispserv_null = {
null_set_window_progress, null_set_window_progress,
NULL, NULL,
NULL, NULL,
NULL,
"null" "null"
}; };

22
gfx/display_servers/dispserv_win32.c
View File

@ -65,6 +65,9 @@ calling RegisterWindowMessage(L("TaskbarButtonCreated")). That message must
be received by your application before it calls any ITaskbarList3 method. be received by your application before it calls any ITaskbarList3 method.
*/ */
static unsigned orig_width = 0;
static unsigned orig_height = 0;
static void* win32_display_server_init(void) static void* win32_display_server_init(void)
{ {
HRESULT hr; HRESULT hr;
@ -98,6 +101,9 @@ static void* win32_display_server_init(void)
static void win32_display_server_destroy(void *data) static void win32_display_server_destroy(void *data)
{ {
video_display_server_switch_resolution(orig_width, orig_height,
0, 60);
dispserv_win32_t *dispserv = (dispserv_win32_t*)data; dispserv_win32_t *dispserv = (dispserv_win32_t*)data;
#ifdef HAS_TASKBAR_EXT #ifdef HAS_TASKBAR_EXT
@ -206,7 +212,12 @@ static bool win32_display_server_set_resolution(void *data,
if (!serv) if (!serv)
return false; return false;
if (orig_width == 0)
orig_width = GetSystemMetrics(SM_CXSCREEN);
if (orig_height == 0)
orig_height = GetSystemMetrics(SM_CYSCREEN);
if (f_restore == 0) if (f_restore == 0)
freq = hz; freq = hz;
@ -270,14 +281,6 @@ static bool win32_display_server_set_resolution(void *data,
return true; return true;
} }
void win32_display_server_get_current_resolution(
unsigned *width, unsigned *height)
{
if (width)
*width = GetSystemMetrics(SM_CYSCREEN);
if (height)
*height = GetSystemMetrics(SM_CXSCREEN);
}
const video_display_server_t dispserv_win32 = { const video_display_server_t dispserv_win32 = {
win32_display_server_init, win32_display_server_init,
@ -285,7 +288,6 @@ const video_display_server_t dispserv_win32 = {
win32_set_window_opacity, win32_set_window_opacity,
win32_set_window_progress, win32_set_window_progress,
win32_set_window_decorations, win32_set_window_decorations,
win32_display_server_get_current_resolution,
win32_display_server_set_resolution, win32_display_server_set_resolution,
"win32" "win32"
}; };