From d9da0bdb12b6df86f266c1af5d9ffb5a39292123 Mon Sep 17 00:00:00 2001
From: lunarcleint <88809950+lunarcleint@users.noreply.github.com>
Date: Sun, 19 Nov 2023 00:07:41 -0700
Subject: [PATCH] Change Top bar a bit more

---
 source/funkin/editors/charter/Charter.hx | 73 +++++++++++++++---------
 source/funkin/editors/ui/UISlider.hx     |  9 +--
 2 files changed, 52 insertions(+), 30 deletions(-)

diff --git a/source/funkin/editors/charter/Charter.hx b/source/funkin/editors/charter/Charter.hx
index 952b6b26..8588c434 100644
--- a/source/funkin/editors/charter/Charter.hx
+++ b/source/funkin/editors/charter/Charter.hx
@@ -39,8 +39,8 @@ class Charter extends UIState {
 	private var gridColor1:FlxColor = 0xFF272727; // white
 	private var gridColor2:FlxColor = 0xFF545454; // gray
 
-	@:noCompletion private var playbackIndex:Int = 6;
-	@:noCompletion private var snapIndex:Int = 5;
+	@:noCompletion private var playbackIndex:Int = 7;
+	@:noCompletion private var snapIndex:Int = 6;
 	public var topMenu:Array<UIContextMenuOption>;
 
 	public var scrollBar:UIScrollBar;
@@ -288,6 +288,30 @@ class Charter extends UIState {
 					}
 				]
 			},
+			{
+				label: "Song",
+				childs: [
+					{
+						label: "Go back to the start",
+						keybind: [HOME],
+						onSelect: _song_start
+					},
+					{
+						label: "Go to the end",
+						keybind: [END],
+						onSelect: _song_end
+					},
+					null,
+					{
+						label: "Mute instrumental",
+						onSelect: _song_muteinst
+					},
+					{
+						label: "Mute voices",
+						onSelect: _song_mutevoices
+					}
+				]
+			},
 			{
 				label: "Snap >",
 				childs: [
@@ -312,6 +336,19 @@ class Charter extends UIState {
 						onSelect: _playback_play
 					},
 					null,
+					{
+						label: "↑ Speed 25%",
+						onSelect: _playback_speed_raise
+					},
+					{
+						label: "Reset Speed",
+						onSelect: _playback_speed_reset
+					},
+					{
+						label: "↓ Speed 25%",
+						onSelect: _playback_speed_lower
+					},
+					null,
 					{
 						label: "Go back a section",
 						keybind: [A],
@@ -323,17 +360,6 @@ class Charter extends UIState {
 						onSelect: _playback_forward
 					},
 					null,
-					{
-						label: "Go back to the start",
-						keybind: [HOME],
-						onSelect: _playback_start
-					},
-					{
-						label: "Go to the end",
-						keybind: [END],
-						onSelect: _playback_end
-					},
-					null,
 					{
 						label: "Metronome",
 						onSelect: _playback_metronome,
@@ -342,15 +368,6 @@ class Charter extends UIState {
 					{
 						label: "Visual metronome"
 					},
-					null,
-					{
-						label: "Mute instrumental",
-						onSelect: _playback_muteinst
-					},
-					{
-						label: "Mute voices",
-						onSelect: _playback_mutevoices
-					}
 				]
 			}
 		];
@@ -1278,14 +1295,18 @@ class Charter extends UIState {
 		}
 	}
 
+	function _playback_speed_raise(_) playBackSlider.value += .25;
+	function _playback_speed_reset(_) playBackSlider.value = 1;
+	function _playback_speed_lower(_) playBackSlider.value -= .25;
+
 	function _playback_metronome(t) {
 		t.icon = (Options.charterMetronomeEnabled = !Options.charterMetronomeEnabled) ? 1 : 0;
 	}
-	function _playback_muteinst(t) {
+	function _song_muteinst(t) {
 		FlxG.sound.music.volume = FlxG.sound.music.volume > 0 ? 0 : 1;
 		t.icon = 1 - Std.int(Math.ceil(FlxG.sound.music.volume));
 	}
-	function _playback_mutevoices(t) {
+	function _song_mutevoices(t) {
 		vocals.volume = vocals.volume > 0 ? 0 : 1;
 		for (strumLine in strumLines.members) strumLine.vocals.volume = strumLine.vocals.volume > 0 ? 0 : 1;
 		t.icon = 1 - Std.int(Math.ceil(vocals.volume));
@@ -1298,11 +1319,11 @@ class Charter extends UIState {
 		if (FlxG.sound.music.playing) return;
 		Conductor.songPosition += (Conductor.beatsPerMesure * __crochet);
 	}
-	function _playback_start(_) {
+	function _song_start(_) {
 		if (FlxG.sound.music.playing) return;
 		Conductor.songPosition = 0;
 	}
-	function _playback_end(_) {
+	function _song_end(_) {
 		if (FlxG.sound.music.playing) return;
 		Conductor.songPosition = FlxG.sound.music.length;
 	}
diff --git a/source/funkin/editors/ui/UISlider.hx b/source/funkin/editors/ui/UISlider.hx
index fca67325..4bae2259 100644
--- a/source/funkin/editors/ui/UISlider.hx
+++ b/source/funkin/editors/ui/UISlider.hx
@@ -26,7 +26,7 @@ class UISlider extends UISprite {
 
 	public var value(default, set):Float = 0;
 	public function set_value(newVal:Float):Float {
-		__barProgress = __calcProgress(newVal); onChange(newVal);
+		__barProgress = __calcProgress(newVal); if (onChange != null) onChange(newVal);
 		return value = newVal;
 	}
 
@@ -51,7 +51,8 @@ class UISlider extends UISprite {
         progressbar.origin.x = 0; progressbar.colorTransform.color = 0xFF67009B;
     	members.push(progressbar);
 
-		__barProgress = visualProgress = __calcProgress(value);
+		this.value = valueStepper.value;
+		visualProgress = __barProgress;
 
 		members.push(startText = new UIText(x, y, 0, Std.string(segments[0].start).replace("0.", ".")));
 		members.push(endText = new UIText(x + (barWidth) + 8, y, 0, Std.string(segments[segments.length-1].end).replace("0.", ".")));
@@ -79,8 +80,8 @@ class UISlider extends UISprite {
 		valueStepper.antialiasing = valueStepper.label.antialiasing = true;
 		valueStepper.onChange = function (text:String) {
 			@:privateAccess valueStepper.__onChange(text);
-			visualProgress = __barProgress = __calcProgress(value = valueStepper.value);
-			if (onChange != null) onChange(value);
+			this.value = valueStepper.value;
+			visualProgress = __barProgress;
 		}
 		members.push(valueStepper);
 	}