asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #56297 from Chaosus/fix_win32_cursor_resize

Browse source
This commit is contained in:
Rémi Verschelde 2022-01-03 14:00:00 +01:00 committed by GitHub
commit 5e4d1c26aa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
platform/windows/display_server_windows.cpp
View file

@ -59,6 +59,15 @@ static String format_error_message(DWORD id) {
return msg; return msg;
} }
static void track_mouse_leave_event(HWND hWnd) {
TRACKMOUSEEVENT tme;
tme.cbSize = sizeof(TRACKMOUSEEVENT);
tme.dwFlags = TME_LEAVE;
tme.hwndTrack = hWnd;
tme.dwHoverTime = HOVER_DEFAULT;
TrackMouseEvent(&tme);
}
bool DisplayServerWindows::has_feature(Feature p_feature) const { bool DisplayServerWindows::has_feature(Feature p_feature) const {
switch (p_feature) { switch (p_feature) {
case FEATURE_SUBWINDOWS: case FEATURE_SUBWINDOWS:
@ -1976,6 +1985,9 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
// Run a timer to prevent event catching warning if the focused window is closing. // Run a timer to prevent event catching warning if the focused window is closing.
windows[window_id].focus_timer_id = SetTimer(windows[window_id].hWnd, 2, USER_TIMER_MINIMUM, (TIMERPROC) nullptr); windows[window_id].focus_timer_id = SetTimer(windows[window_id].hWnd, 2, USER_TIMER_MINIMUM, (TIMERPROC) nullptr);
} }
if (wParam != WA_INACTIVE) {
track_mouse_leave_event(hWnd);
}
return 0; // Return to the message loop. return 0; // Return to the message loop.
} break; } break;
case WM_GETMINMAXINFO: { case WM_GETMINMAXINFO: {
@ -2260,12 +2272,7 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
outside = false; outside = false;
// Once-off notification, must call again. // Once-off notification, must call again.
TRACKMOUSEEVENT tme; track_mouse_leave_event(hWnd);
tme.cbSize = sizeof(TRACKMOUSEEVENT);
tme.dwFlags = TME_LEAVE;
tme.hwndTrack = hWnd;
tme.dwHoverTime = HOVER_DEFAULT;
TrackMouseEvent(&tme);
} }
// Don't calculate relative mouse movement if we don't have focus in CAPTURED mode. // Don't calculate relative mouse movement if we don't have focus in CAPTURED mode.
@ -2366,12 +2373,7 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
outside = false; outside = false;
// Once-off notification, must call again. // Once-off notification, must call again.
TRACKMOUSEEVENT tme; track_mouse_leave_event(hWnd);
tme.cbSize = sizeof(TRACKMOUSEEVENT);
tme.dwFlags = TME_LEAVE;
tme.hwndTrack = hWnd;
tme.dwHoverTime = HOVER_DEFAULT;
TrackMouseEvent(&tme);
} }
// Don't calculate relative mouse movement if we don't have focus in CAPTURED mode. // Don't calculate relative mouse movement if we don't have focus in CAPTURED mode.
@ -3126,14 +3128,6 @@ DisplayServer::WindowID DisplayServerWindows::_create_window(WindowMode p_mode,
#endif #endif
RegisterTouchWindow(wd.hWnd, 0); RegisterTouchWindow(wd.hWnd, 0);
TRACKMOUSEEVENT tme;
tme.cbSize = sizeof(TRACKMOUSEEVENT);
tme.dwFlags = TME_LEAVE;
tme.hwndTrack = wd.hWnd;
tme.dwHoverTime = HOVER_DEFAULT;
TrackMouseEvent(&tme);
DragAcceptFiles(wd.hWnd, true); DragAcceptFiles(wd.hWnd, true);
if ((tablet_get_current_driver() == "wintab") && wintab_available) { if ((tablet_get_current_driver() == "wintab") && wintab_available) {