Merge branch 'main' of https://github.com/poec987/FNF-V3

poec987 · Jun 26, 2024 · 2685089 · 2685089
2 parents d99518e + a2832a9
commit 2685089
Showing 1 changed file with 18 additions and 13 deletions.
diff --git a/source/ChartingState.hx b/source/ChartingState.hx
@@ -645,15 +645,17 @@ class ChartingState extends MusicBeatState
 			FlxG.switchState(new PlayState());
 		}
 
-		if (FlxG.keys.justPressed.E)
-		{
-			changeNoteSustain(Conductor.stepCrochet);
-		}
-		if (FlxG.keys.justPressed.Q)
-		{
-			changeNoteSustain(-Conductor.stepCrochet);
+		if (!noteTypeParamTextBox.hasFocus) {
+			if (FlxG.keys.justPressed.E)
+			{
+				changeNoteSustain(Conductor.stepCrochet);
+			}
+			if (FlxG.keys.justPressed.Q)
+			{
+				changeNoteSustain(-Conductor.stepCrochet);
+			}
 		}
-
+		
 		if (FlxG.keys.justPressed.TAB)
 		{
 			if (FlxG.keys.pressed.SHIFT)
@@ -670,7 +672,7 @@ class ChartingState extends MusicBeatState
 			}
 		}
 
-		if (!typingShit.hasFocus)
+		if (!typingShit.hasFocus && !noteTypeParamTextBox.hasFocus)
 		{
 			if (FlxG.keys.justPressed.SPACE)
 			{
@@ -757,10 +759,13 @@ class ChartingState extends MusicBeatState
 		var shiftThing:Int = 1;
 		if (FlxG.keys.pressed.SHIFT)
 			shiftThing = 4;
-		if (FlxG.keys.justPressed.RIGHT || FlxG.keys.justPressed.D)
-			changeSection(curSection + shiftThing);
-		if (FlxG.keys.justPressed.LEFT || FlxG.keys.justPressed.A)
-			changeSection(curSection - shiftThing);
+
+		if (!noteTypeParamTextBox.hasFocus) {
+			if (FlxG.keys.justPressed.RIGHT || FlxG.keys.justPressed.D)
+				changeSection(curSection + shiftThing);
+			if (FlxG.keys.justPressed.LEFT || FlxG.keys.justPressed.A)
+				changeSection(curSection - shiftThing);
+		}
 
 		// HITSOUNDS
 		if (doHitSounds) {