ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(Windows Frontend) Fix the bug where cursor is auto-hidden even when over the menu 

Also, changed the time before auto-hiding to 10 seconds.
This commit is contained in:
retr0s4ge 2018-08-12 19:58:02 +02:00
parent 36b97ada75
commit 775e3ae91a
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
desmume/src/frontend/windows/main.cpp
View File

@ -4654,6 +4654,12 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM
{
static int tmp_execute;
static UINT_PTR autoHideCursorTimer = 0;
static bool mouseLeftClientArea = true;
TRACKMOUSEEVENT tme;
tme.cbSize = sizeof(tme);
tme.dwFlags = TME_LEAVE;
tme.hwndTrack = hwnd;
switch (message) // handle the messages
{
@ -4997,8 +5003,9 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM
{
if (autoHideCursorTimer == wParam)
{
if (((IsZoomed(hwnd) && (GetStyle()&DWS_FULLSCREEN)) || fsWindow) && autoHideCursor)
while (ShowCursor(FALSE) >= 0);
if(autoHideCursor && !mouseLeftClientArea)
if ((IsZoomed(hwnd) && (GetStyle()&DWS_FULLSCREEN)) || fsWindow)
while (ShowCursor(FALSE) >= 0);
}
return 0;
}
@ -5423,8 +5430,13 @@ DOKEYDOWN:
case WM_MOUSEMOVE:
case WM_LBUTTONDOWN:
case WM_LBUTTONDBLCLK:
if (mouseLeftClientArea)
{
TrackMouseEvent(&tme);
mouseLeftClientArea = false;
}
while (ShowCursor(TRUE) <= 0);
autoHideCursorTimer = SetTimer(hwnd, 1, 5000, NULL);
autoHideCursorTimer = SetTimer(hwnd, 1, 10000, NULL);
if (((message==WM_POINTERDOWN || message== WM_POINTERUPDATE)
&& ((wParam & (POINTER_MESSAGE_FLAG_INCONTACT | POINTER_MESSAGE_FLAG_FIRSTBUTTON))))
@ -5519,6 +5531,9 @@ DOKEYDOWN:
userTouchesScreen = false;
return 0;
case WM_MOUSELEAVE:
mouseLeftClientArea = true;
return 0;
#if 0
case WM_INITMENU: {
HMENU menu = (HMENU)wParam;