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

Try to avoid overly sensitive mice from unhiding the autohidden cursor, hide the cursor better for Windows

This commit is contained in:
CasualPokePlayer 2024-10-11 18:32:06 -07:00
parent 40dae6e8ae
commit 77d19e0fed
2 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/BizHawk.Client.EmuHawk/MainForm.Events.cs
View File

@ -1572,13 +1572,13 @@ namespace BizHawk.Client.EmuHawk
{
if (_inFullscreen && Config.DispChromeFullscreenAutohideMouse)
{
AutohideCursor(true);
AutohideCursor(hide: true);
}
}
private void MainForm_Enter(object sender, EventArgs e)
{
AutohideCursor(false);
AutohideCursor(hide: false);
}
private void MainForm_Resize(object sender, EventArgs e)

30
src/BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -446,7 +446,7 @@ namespace BizHawk.Client.EmuHawk
void MainForm_MouseClick(object sender, MouseEventArgs e)
{
AutohideCursor(false);
AutohideCursor(hide: false);
if (Config.ShowContextMenu && e.Button == MouseButtons.Right)
{
// suppress the context menu if right click has a binding
@ -460,7 +460,7 @@ namespace BizHawk.Client.EmuHawk
MainFormContextMenu.Show(PointToScreen(new Point(e.X, e.Y + MainformMenu.Height)));
}
}
void MainForm_MouseMove(object sender, MouseEventArgs e) => AutohideCursor(false);
void MainForm_MouseMove(object sender, MouseEventArgs e) => AutohideCursor(hide: false, alwaysUpdate: false);
void MainForm_MouseWheel(object sender, MouseEventArgs e) => MouseWheelTracker += e.Delta;
MouseClick += MainForm_MouseClick;
MouseMove += MainForm_MouseMove;
@ -1493,7 +1493,7 @@ namespace BizHawk.Client.EmuHawk
public void ToggleFullscreen(bool allowSuppress = false)
{
AutohideCursor(false);
AutohideCursor(hide: false);
// prohibit this operation if the current controls include LMouse
if (allowSuppress)
@ -2259,16 +2259,38 @@ namespace BizHawk.Client.EmuHawk
foreach (var args in todo) SingleInstanceProcessArgs(args);
}
private void AutohideCursor(bool hide)
private Point _lastMouseAutoHidePos;
private void AutohideCursor(bool hide, bool alwaysUpdate = true)
{
var mousePos = MousePosition;
// avoid sensitive mice unhiding the mouse cursor
var shouldUpdateCursor = alwaysUpdate
|| Math.Abs(_lastMouseAutoHidePos.X - mousePos.X) > 5
|| Math.Abs(_lastMouseAutoHidePos.Y - mousePos.Y) > 5;
if (!shouldUpdateCursor)
{
return;
}
_lastMouseAutoHidePos = mousePos;
if (hide && !_cursorHidden)
{
// this only works assuming the mouse is perfectly still
// if the mouse is slightly moving, it will use the "moving" cursor rather
_presentationPanel.Control.Cursor = Properties.Resources.BlankCursor;
// This will actually fully hide the cursor
// However, this is a no-op on Mono, so we need to do both ways
Cursor.Hide();
_cursorHidden = true;
}
else if (!hide && _cursorHidden)
{
_presentationPanel.Control.Cursor = Cursors.Default;
Cursor.Show();
timerMouseIdle.Stop();
timerMouseIdle.Start();
_cursorHidden = false;