From 7df13ec012ec6b2562501254453c2f038dbec5c1 Mon Sep 17 00:00:00 2001
From: Furo <furogaming9@gmail.com>
Date: Sun, 17 Aug 2025 13:07:17 +0200
Subject: [PATCH] Fix Bookmarks Z-Index and Scrollbar Position (on creation)

---
 source/funkin/editors/charter/Charter.hx | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/source/funkin/editors/charter/Charter.hx b/source/funkin/editors/charter/Charter.hx
index facf0035..bde31844 100644
--- a/source/funkin/editors/charter/Charter.hx
+++ b/source/funkin/editors/charter/Charter.hx
@@ -44,6 +44,7 @@ class Charter extends UIState {
 		return FlxG.state is Charter ? cast FlxG.state : null;
 
 	public var charterBG:FunkinSprite;
+	public var charterBookmarksGroup:FlxTypedGroup<FlxSprite> = new FlxTypedGroup<FlxSprite>();
 	public var uiGroup:FlxTypedGroup<FlxSprite> = new FlxTypedGroup<FlxSprite>();
 
 	public var topMenu:Array<UIContextMenuOption>;
@@ -462,7 +463,7 @@ class Charter extends UIState {
 		noteHoverer = new CharterNoteHoverer();
 		noteDeleteAnims = new CharterDeleteAnim();
 
-		selectionBox.cameras = notesGroup.cameras = gridBackdrops.cameras =
+		charterBookmarksGroup.cameras = selectionBox.cameras = notesGroup.cameras = gridBackdrops.cameras =
 		noteHoverer.cameras = noteDeleteAnims.cameras = [charterCamera];
 
 		topMenuSpr = new UITopMenu(topMenu);
@@ -551,6 +552,7 @@ class Charter extends UIState {
 		add(noteDeleteAnims);
 		add(notesGroup);
 		add(selectionBox);
+		add(charterBookmarksGroup);
 		add(strumlineInfoBG);
 		add(strumlineLockButton);
 		add(strumlineAddButton);
@@ -572,6 +574,8 @@ class Charter extends UIState {
 		if (Options.editorsResizable)
 			UIState.setResolutionAware();
 
+		updateBookmarks(); //recalling it to fix resolutions
+
 		// ! IF YOU EVER WANNA VIEW IN THE FUTURE, JUST USE A FLXSPRITE :D -lunar
 		/*var dataDisplay:FlxSprite = new FlxSprite().loadGraphic(waveformHandler.waveDatas.get("Voices.ogg"));
 		dataDisplay.scrollFactor.set(1, 0);
@@ -1915,12 +1919,12 @@ class Charter extends UIState {
 			if (bars != null) {
 				for (spr in bars) {
 					if (spr == null) continue;
-					remove(spr);
+					charterBookmarksGroup.remove(spr);
 					spr.kill();
 				}
 			}
 			if (text != null) {
-				remove(text);
+				charterBookmarksGroup.remove(text);
 				text.kill();
 			}
 		}
@@ -1941,15 +1945,13 @@ class Charter extends UIState {
 			{
 				var bookmarkspr = new FlxSprite(str.x, (b.time * 40)).makeSolid(str.keyCount * 40, 4, bookmarkcolor);
 				bookmarkspr.updateHitbox();
-				bookmarkspr.camera = charterCamera;
-				add(bookmarkspr);
+				charterBookmarksGroup.add(bookmarkspr);
 				sprites.push(bookmarkspr);
 			}
 
 			var bookmarkText = new UIText(strumLines.members[0].x + 4, 0, 400, b.name, 15, bookmarkcolor, true);
 			bookmarkText.y = sprites[0].y - (bookmarkText.height + 2);
-			bookmarkText.camera = charterCamera;
-			add(bookmarkText);
+			charterBookmarksGroup.add(bookmarkText);
 
 			if (luminance < 0.5)
 				bookmarkText.borderColor = 0x88FFFFFF;