From edf93f8eddffcb4717235eb94f2807eb235030a1 Mon Sep 17 00:00:00 2001
From: RandomityGuy <31925790+RandomityGuy@users.noreply.github.com>
Date: Sat, 17 Dec 2022 14:39:47 +0530
Subject: [PATCH] accelerator key fixes and fix camera on unpause

---
 src/CameraController.hx   | 7 +++++++
 src/gui/EnterNameDlg.hx   | 1 +
 src/gui/ExitGameDlg.hx    | 1 -
 src/gui/PlayMissionGui.hx | 2 --
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/CameraController.hx b/src/CameraController.hx
index ded3867e..34347e5f 100644
--- a/src/CameraController.hx
+++ b/src/CameraController.hx
@@ -68,6 +68,8 @@ class CameraController extends Object {
 	public var oob:Bool = false;
 	public var finish:Bool = false;
 
+	var _ignoreCursor:Bool = false;
+
 	public function new(marble:Marble) {
 		super();
 		this.marble = marble;
@@ -88,6 +90,7 @@ class CameraController extends Object {
 		var pointercontainer = js.Browser.document.querySelector("#pointercontainer");
 		pointercontainer.hidden = true;
 		#end
+		_ignoreCursor = true;
 		Window.getInstance().lockPointer((x, y) -> orbit(x, y));
 		#if hl
 		Cursor.show(false);
@@ -108,6 +111,10 @@ class CameraController extends Object {
 	}
 
 	public function orbit(mouseX:Float, mouseY:Float, isTouch:Bool = false) {
+		if (_ignoreCursor) {
+			_ignoreCursor = false;
+			return;
+		}
 		var scaleFactor = 1.0;
 		#if js
 		scaleFactor = 1 / js.Browser.window.devicePixelRatio;
diff --git a/src/gui/EnterNameDlg.hx b/src/gui/EnterNameDlg.hx
index 930fdad1..6c57f895 100644
--- a/src/gui/EnterNameDlg.hx
+++ b/src/gui/EnterNameDlg.hx
@@ -61,6 +61,7 @@ class EnterNameDlg extends GuiControl {
 		var okbutton = new GuiButton(loadButtonImages("data/ui/endgame/ok"));
 		okbutton.position = new Vector(151, 184);
 		okbutton.extent = new Vector(110, 55);
+		okbutton.accelerator = hxd.Key.ENTER;
 		okbutton.pressedAction = (sender) -> {
 			MarbleGame.canvas.popDialog(this);
 			Settings.highscoreName = enterNameEdit.text.text;
diff --git a/src/gui/ExitGameDlg.hx b/src/gui/ExitGameDlg.hx
index 7f05a710..06226e71 100644
--- a/src/gui/ExitGameDlg.hx
+++ b/src/gui/ExitGameDlg.hx
@@ -48,7 +48,6 @@ class ExitGameDlg extends GuiControl {
 		noButton.extent = new Vector(86, 40);
 		noButton.vertSizing = Top;
 		noButton.horizSizing = Right;
-		noButton.accelerator = hxd.Key.ESCAPE;
 		noButton.pressedAction = (sender) -> noFunc(noButton);
 
 		var restartButton = new GuiButton(loadButtonImages("data/ui/common/restart"));
diff --git a/src/gui/PlayMissionGui.hx b/src/gui/PlayMissionGui.hx
index b488e581..c56c82c1 100644
--- a/src/gui/PlayMissionGui.hx
+++ b/src/gui/PlayMissionGui.hx
@@ -200,7 +200,6 @@ class PlayMissionGui extends GuiImage {
 		var pmPrev = new GuiButton(loadButtonImages("data/ui/play/prev"));
 		pmPrev.position = new Vector(436, 325);
 		pmPrev.extent = new Vector(72, 43);
-		pmPrev.accelerator = hxd.Key.LEFT;
 		pmPrev.pressedAction = (sender) -> {
 			setSelectedFunc(currentSelection - 1);
 		}
@@ -222,7 +221,6 @@ class PlayMissionGui extends GuiImage {
 		var pmNext = new GuiButton(loadButtonImages("data/ui/play/next"));
 		pmNext.position = new Vector(604, 325);
 		pmNext.extent = new Vector(72, 43);
-		pmNext.accelerator = hxd.Key.RIGHT;
 		pmNext.pressedAction = (sender) -> {
 			setSelectedFunc(currentSelection + 1);
 		}