From 341086c5f51df845132bd72c0de8a45da89c9eb7 Mon Sep 17 00:00:00 2001 From: miku-666 <74728189+NessieHax@users.noreply.github.com> Date: Sat, 20 Jan 2024 22:10:40 +0100 Subject: [PATCH] SkinRenderer - Add ReleaseMouse function --- PCK-Studio/Rendering/SkinRenderer.cs | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/PCK-Studio/Rendering/SkinRenderer.cs b/PCK-Studio/Rendering/SkinRenderer.cs index 8610da51..b6e38d4a 100644 --- a/PCK-Studio/Rendering/SkinRenderer.cs +++ b/PCK-Studio/Rendering/SkinRenderer.cs @@ -304,11 +304,7 @@ namespace PckStudio.Rendering switch (keyData) { case Keys.Escape: - if (IsMouseHidden || _IsLeftMouseDown || _IsRightMouseDown) - { - IsMouseHidden = _IsRightMouseDown = _IsLeftMouseDown = false; - Cursor.Position = PreviousMouseLocation; - } + ReleaseMouse(); var point = new Point(Parent.Location.X + Location.X, Parent.Location.Y + Location.Y); contextMenuStrip1.Show(point); return true; @@ -336,11 +332,7 @@ namespace PckStudio.Rendering Refresh(); return true; case Keys.A: - if (IsMouseHidden || _IsLeftMouseDown || _IsRightMouseDown) - { - IsMouseHidden = _IsRightMouseDown = _IsLeftMouseDown = false; - Cursor.Position = PreviousMouseLocation; - } + ReleaseMouse(); { using var animeditor = new ANIMEditor(ANIM); if (animeditor.ShowDialog() == DialogResult.OK) @@ -354,6 +346,15 @@ namespace PckStudio.Rendering return base.ProcessDialogKey(keyData); } + private void ReleaseMouse() + { + if (IsMouseHidden || _isLeftMouseDown || _isRightMouseDown) + { + IsMouseHidden = _isRightMouseDown = _isLeftMouseDown = false; + Cursor.Position = PreviousMouseLocation; + } + } + private void OnANIMUpdate() { head.SetEnabled(0, !ANIM.GetFlag(SkinAnimFlag.HEAD_DISABLED)); @@ -530,11 +531,7 @@ namespace PckStudio.Rendering protected override void OnMouseUp(MouseEventArgs e) { - if (IsMouseHidden) - { - Cursor.Position = PreviousMouseLocation; - IsMouseHidden = _IsLeftMouseDown = _IsRightMouseDown = false; - } + ReleaseMouse(); base.OnMouseUp(e); }