Stop changing props menu during modify scale factor

lge-ros2 · Dec 5, 2023 · 0541f54 · 0541f54
1 parent b44211f
commit 0541f54
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/Assets/Scripts/UI/SimulationDisplay.Props.cs b/Assets/Scripts/UI/SimulationDisplay.Props.cs
@@ -18,11 +18,7 @@ public partial class SimulationDisplay : MonoBehaviour
 	private bool checkScaleFactorFocused = false;
 	private bool doCheckScaleFactorValue = false;
 	private RectOffset zeroPadding;
-
-	private void InitPropsMenu()
-	{
-		// toolbarStrings = new string[] { "Box", "Cylinder", "Sphere" };
-	}
+	private bool isChangingScaleFactor = false;
 
 	private void DrawPropsMenus()
 	{
@@ -59,6 +55,8 @@ private void DrawPropsMenus()
 		GUI.skin.textField.alignment = TextAnchor.MiddleCenter;
 		scaleFactorString = GUI.TextField(rectScale, scaleFactorString, 5);
 
+		isChangingScaleFactor = (GUI.GetNameOfFocusedControl().CompareTo("ScaleField") == 0);
+
 		rectHelpButton.x = rectScale.x + rectScale.width + textRightMargin;
 
 		if (checkScaleFactorFocused && !GUI.GetNameOfFocusedControl().Equals("ScaleField"))

diff --git a/Assets/Scripts/UI/SimulationDisplay.cs b/Assets/Scripts/UI/SimulationDisplay.cs
@@ -91,7 +91,6 @@ void Awake()
 		padding = new RectOffset(30, 30, 30, 30);
 		zeroPadding = new RectOffset(0, 0, 0, 0);
 
-		InitPropsMenu();
 		UpdateHelpContents();
 	}
 
@@ -179,27 +178,30 @@ void OnGUI()
 		if (Event.current.type.Equals(EventType.KeyUp))
 		{
 			var keyCode = Event.current.keyCode;
-			if (keyCode.CompareTo(KeyCode.F1) == 0)
+			if (keyCode == KeyCode.F1)
 			{
 				popupHelpDialog = !popupHelpDialog;
 				cameraControl.BlockMouseWheelControl(true);
 			}
-			else if (keyCode.CompareTo(KeyCode.Escape) == 0)
+			else if (keyCode == KeyCode.Escape)
 			{
 				popupHelpDialog = false;
 				cameraControl.BlockMouseWheelControl(false);
 			}
-			else if (keyCode.CompareTo(KeyCode.Alpha1) == 0)
+			else if (keyCode >= KeyCode.Alpha1 && keyCode <= KeyCode.Alpha9 && isChangingScaleFactor == false)
 			{
-				_toolbarSelected = 0;
-			}
-			else if (keyCode.CompareTo(KeyCode.Alpha2) == 0)
-			{
-				_toolbarSelected = 1;
-			}
-			else if (keyCode.CompareTo(KeyCode.Alpha3) == 0)
-			{
-				_toolbarSelected = 2;
+				switch (keyCode)
+				{
+					case KeyCode.Alpha1:
+						_toolbarSelected = 0;
+						break;
+					case KeyCode.Alpha2:
+						_toolbarSelected = 1;
+						break;
+					case KeyCode.Alpha3:
+						_toolbarSelected = 2;
+						break;
+				}
 			}
 		}