github
/
mpv
mirror of https://github.com/mpv-player/mpv
1
Fork 0
Code Releases Activity

w32_common: improve the window message state machine 

* Distinguish between the window being moved or not.
* Skip trying to snap if currently in full screen or an embedded
  window.
* Exit snapped state if the size changed when the window was being
  moved.
This commit is contained in:
pavelxdd 2017-12-05 01:21:34 +02:00 committed by Jan Ekström
parent 483437ba91
commit 665173d8b2
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
video/out/w32_common.c
View File

@ -141,6 +141,7 @@ struct vo_w32_state {
// updates on move/resize/displaychange
double display_fps;
bool moving;
bool snapped;
int snap_dx;
int snap_dy;
@ -941,12 +942,14 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam,
break;
}
case WM_MOVING: {
w32->moving = true;
RECT *rc = (RECT*)lParam;
if (snap_to_screen_edges(w32, rc))
if (!w32->current_fs && !w32->parent && snap_to_screen_edges(w32, rc))
return TRUE;
break;
}
case WM_ENTERSIZEMOVE:
w32->moving = true;
if (w32->snapped) {
// Save the cursor offset from the window borders,
// so the player window can be unsnapped later
@ -958,7 +961,13 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam,
}
}
break;
case WM_EXITSIZEMOVE:
w32->moving = false;
break;
case WM_SIZE: {
if (w32->moving)
w32->snapped = false;
RECT r;
if (GetClientRect(w32->window, &r) && r.right > 0 && r.bottom > 0) {
w32->dw = r.right;
@ -1430,6 +1439,9 @@ static void *gui_thread(void *ptr)
EnableWindow(w32->window, 0);
w32->cursor_visible = true;
w32->moving = false;
w32->snapped = false;
w32->snap_dx = w32->snap_dy = 0;
update_screen_rect(w32);