RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-28 18:12:22 +00:00
Code Issues Releases Wiki Activity

win32, vo_directx: don't use vo_dx/dy, directly query window position

Browse Source 
This should be a bit robuster than trying to maintain vo_dx/dy.
vo_dy/dy are now completely unused on win32, except for initialization.
This commit is contained in:
wm4 2011-10-28 12:39:43 +02:00
parent 2449cbde2c
commit 32de5df90c
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libvo/vo_directx.c
View File

@ -458,8 +458,11 @@ static uint32_t Directx_ManageDisplay(void)
DWORD dwUpdateFlags = 0;
int width, height;
rd.left = vo_dx - xinerama_x;
rd.top = vo_dy - xinerama_y;
POINT origin = { 0, 0 };
ClientToScreen(vo_w32_window, &origin);
rd.left = origin.x - xinerama_x;
rd.top = origin.y - xinerama_y;
width = vo_dwidth;
height = vo_dheight;

11
libvo/w32_common.c
View File

@ -117,9 +117,10 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM l
p.x = 0;
p.y = 0;
ClientToScreen(vo_window, &p);
vo_dx = window_x = p.x;
vo_dy = window_y = p.y;
mp_msg(MSGT_VO, MSGL_V, "[vo] move window: %d:%d\n", vo_dx, vo_dy);
window_x = p.x;
window_y = p.y;
mp_msg(MSGT_VO, MSGL_V, "[vo] move window: %d:%d\n",
window_x, window_y);
break;
case WM_SIZE:
event_flags |= VO_EVENT_RESIZE;
@ -493,10 +494,6 @@ int vo_w32_config(uint32_t width, uint32_t height, uint32_t flags) {
GetClientRect(vo_window, &r);
vo_dwidth = r.right;
vo_dheight = r.bottom;
// restore these as well, xxx change vo_directx instead to query
// the window bounds instead of using this
vo_dx = window_x;
vo_dy = window_y;
} else {
// first vo_config call; vo_config() will always set vo_dx/dy so
// that the window is centered on the screen, and this is the only