PR Feedback

* A simpler version of the previous implementation.

Co-Authored-By: gdkchan <5624669+gdkchan@users.noreply.github.com>
This commit is contained in:
Exhigh 2024-04-27 03:33:52 +05:30
commit e88b3cf0dd

View file

@ -103,11 +103,11 @@ namespace Ryujinx.Ava
ForceChangeCursor ForceChangeCursor
}; };
private CursorStates cursorState = CursorStates.CursorIsVisible;
private CursorStates _cursorState = !ConfigurationState.Instance.Hid.EnableMouse.Value ? private CursorStates _cursorState = !ConfigurationState.Instance.Hid.EnableMouse.Value ?
CursorStates.CursorIsVisible : CursorStates.CursorIsHidden; CursorStates.CursorIsVisible : CursorStates.CursorIsHidden;
private bool _isCursorVisible = !ConfigurationState.Instance.Hid.EnableMouse.Value;
private bool _isStopped; private bool _isStopped;
private bool _isActive; private bool _isActive;
private bool _renderingStarted; private bool _renderingStarted;
@ -1105,21 +1105,18 @@ namespace Ryujinx.Ava
{ {
if (ConfigurationState.Instance.Hid.EnableMouse.Value) if (ConfigurationState.Instance.Hid.EnableMouse.Value)
{ {
cursorState = ConfigurationState.Instance.HideCursor.Value == HideCursorMode.Never _isCursorVisible = ConfigurationState.Instance.HideCursor.Value == HideCursorMode.Never;
? CursorStates.CursorIsVisible
: CursorStates.CursorIsHidden;
} }
else else
{ {
cursorState = ConfigurationState.Instance.HideCursor.Value == HideCursorMode.Never || _isCursorVisible = ConfigurationState.Instance.HideCursor.Value == HideCursorMode.Never ||
Stopwatch.GetTimestamp() - _lastCursorMoveTime < CursorHideIdleTime * Stopwatch.Frequency (ConfigurationState.Instance.HideCursor.Value == HideCursorMode.OnIdle &&
? CursorStates.CursorIsVisible Stopwatch.GetTimestamp() - _lastCursorMoveTime < CursorHideIdleTime * Stopwatch.Frequency);
: CursorStates.CursorIsHidden;
} }
if (_cursorState != cursorState) if (_cursorState != (_isCursorVisible ? CursorStates.CursorIsVisible : CursorStates.CursorIsHidden))
{ {
if (cursorState == CursorStates.CursorIsVisible) if (_isCursorVisible)
{ {
ShowCursor(); ShowCursor();
} }