Simplify win32_monitor_from_window
This commit is contained in:
parent
9dec15767a
commit
f490b2b58a
|
@ -158,12 +158,12 @@ static BOOL CALLBACK win32_monitor_enum_proc(HMONITOR hMonitor,
|
|||
}
|
||||
|
||||
|
||||
void win32_monitor_from_window(HWND data, bool destroy)
|
||||
void win32_monitor_from_window(void)
|
||||
{
|
||||
#ifndef _XBOX
|
||||
HWND data = win32_get_window();
|
||||
win32_monitor_last = MonitorFromWindow(data, MONITOR_DEFAULTTONEAREST);
|
||||
if (destroy && data)
|
||||
DestroyWindow(data);
|
||||
DestroyWindow(data);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
@ -186,7 +186,7 @@ void win32_monitor_info(void *data, void *hm_data, unsigned *mon_id)
|
|||
HMONITOR *hm_to_use = (HMONITOR*)hm_data;
|
||||
|
||||
if (!win32_monitor_last)
|
||||
win32_monitor_from_window(GetDesktopWindow(), false);
|
||||
win32_monitor_last = MonitorFromWindow(GetDesktopWindow(), MONITOR_DEFAULTTONEAREST);
|
||||
|
||||
*hm_to_use = win32_monitor_last;
|
||||
fs_monitor = settings->video.monitor_index;
|
||||
|
|
|
@ -55,7 +55,7 @@ void shader_dlg_show(HWND parent_hwnd);
|
|||
void shader_dlg_params_reload(void);
|
||||
#endif
|
||||
|
||||
void win32_monitor_from_window(HWND data, bool destroy);
|
||||
void win32_monitor_from_window(void);
|
||||
|
||||
void win32_monitor_init(void);
|
||||
|
||||
|
|
|
@ -1194,7 +1194,6 @@ static void d3d_free_overlays(d3d_video_t *d3d)
|
|||
static void d3d_free(void *data)
|
||||
{
|
||||
d3d_video_t *d3d = (d3d_video_t*)data;
|
||||
HWND window = win32_get_window();
|
||||
|
||||
if (!d3d)
|
||||
return;
|
||||
|
@ -1218,7 +1217,7 @@ static void d3d_free(void *data)
|
|||
d3d->dev = NULL;
|
||||
g_pD3D = NULL;
|
||||
|
||||
win32_monitor_from_window(window, true);
|
||||
win32_monitor_from_window();
|
||||
|
||||
if (d3d)
|
||||
delete d3d;
|
||||
|
|
|
@ -506,7 +506,7 @@ static void gfx_ctx_wgl_destroy(void *data)
|
|||
|
||||
if (window)
|
||||
{
|
||||
win32_monitor_from_window(window, true);
|
||||
win32_monitor_from_window();
|
||||
win32_destroy_window();
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue