STORM-2151: Respect "Hide cursor while typing" user setting on Windows
parent
8c03881193
commit
f1c76a376c
|
|
@ -216,6 +216,7 @@ Ansariel Hiller
|
|||
MAINT-7059
|
||||
MAINT-6519
|
||||
MAINT-7899
|
||||
STORM-2151
|
||||
Aralara Rajal
|
||||
Arare Chantilly
|
||||
CHUIBUG-191
|
||||
|
|
|
|||
|
|
@ -421,6 +421,11 @@ LLWindowWin32::LLWindowWin32(LLWindowCallbacks* callbacks,
|
|||
mKeyVirtualKey = 0;
|
||||
mhDC = NULL;
|
||||
mhRC = NULL;
|
||||
|
||||
if (!SystemParametersInfo(SPI_GETMOUSEVANISH, 0, &mMouseVanish, 0))
|
||||
{
|
||||
mMouseVanish = TRUE;
|
||||
}
|
||||
|
||||
// Initialize the keyboard
|
||||
gKeyboard = new LLKeyboardWin32();
|
||||
|
|
@ -1680,7 +1685,7 @@ void LLWindowWin32::showCursorFromMouseMove()
|
|||
|
||||
void LLWindowWin32::hideCursorUntilMouseMove()
|
||||
{
|
||||
if (!mHideCursorPermanent)
|
||||
if (!mHideCursorPermanent && mMouseVanish)
|
||||
{
|
||||
hideCursor();
|
||||
mHideCursorPermanent = FALSE;
|
||||
|
|
@ -2668,6 +2673,18 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
|
|||
return 0;
|
||||
|
||||
break;
|
||||
|
||||
case WM_SETTINGCHANGE:
|
||||
{
|
||||
if (w_param == SPI_SETMOUSEVANISH)
|
||||
{
|
||||
if (!SystemParametersInfo(SPI_GETMOUSEVANISH, 0, &window_imp->mMouseVanish, 0))
|
||||
{
|
||||
window_imp->mMouseVanish = TRUE;
|
||||
}
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
window_imp->mCallbacks->handlePauseWatchdog(window_imp);
|
||||
|
|
|
|||
|
|
@ -214,6 +214,8 @@ protected:
|
|||
U32 mRawWParam;
|
||||
U32 mRawLParam;
|
||||
|
||||
BOOL mMouseVanish;
|
||||
|
||||
friend class LLWindowManager;
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue