Skip to content

Commit 7df13ec

Browse files
committed
Fix Bookmarks Z-Index and Scrollbar Position (on creation)
1 parent 68a5dd2 commit 7df13ec

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

source/funkin/editors/charter/Charter.hx

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ class Charter extends UIState {
4444
return FlxG.state is Charter ? cast FlxG.state : null;
4545

4646
public var charterBG:FunkinSprite;
47+
public var charterBookmarksGroup:FlxTypedGroup<FlxSprite> = new FlxTypedGroup<FlxSprite>();
4748
public var uiGroup:FlxTypedGroup<FlxSprite> = new FlxTypedGroup<FlxSprite>();
4849

4950
public var topMenu:Array<UIContextMenuOption>;
@@ -462,7 +463,7 @@ class Charter extends UIState {
462463
noteHoverer = new CharterNoteHoverer();
463464
noteDeleteAnims = new CharterDeleteAnim();
464465

465-
selectionBox.cameras = notesGroup.cameras = gridBackdrops.cameras =
466+
charterBookmarksGroup.cameras = selectionBox.cameras = notesGroup.cameras = gridBackdrops.cameras =
466467
noteHoverer.cameras = noteDeleteAnims.cameras = [charterCamera];
467468

468469
topMenuSpr = new UITopMenu(topMenu);
@@ -551,6 +552,7 @@ class Charter extends UIState {
551552
add(noteDeleteAnims);
552553
add(notesGroup);
553554
add(selectionBox);
555+
add(charterBookmarksGroup);
554556
add(strumlineInfoBG);
555557
add(strumlineLockButton);
556558
add(strumlineAddButton);
@@ -572,6 +574,8 @@ class Charter extends UIState {
572574
if (Options.editorsResizable)
573575
UIState.setResolutionAware();
574576

577+
updateBookmarks(); //recalling it to fix resolutions
578+
575579
// ! IF YOU EVER WANNA VIEW IN THE FUTURE, JUST USE A FLXSPRITE :D -lunar
576580
/*var dataDisplay:FlxSprite = new FlxSprite().loadGraphic(waveformHandler.waveDatas.get("Voices.ogg"));
577581
dataDisplay.scrollFactor.set(1, 0);
@@ -1915,12 +1919,12 @@ class Charter extends UIState {
19151919
if (bars != null) {
19161920
for (spr in bars) {
19171921
if (spr == null) continue;
1918-
remove(spr);
1922+
charterBookmarksGroup.remove(spr);
19191923
spr.kill();
19201924
}
19211925
}
19221926
if (text != null) {
1923-
remove(text);
1927+
charterBookmarksGroup.remove(text);
19241928
text.kill();
19251929
}
19261930
}
@@ -1941,15 +1945,13 @@ class Charter extends UIState {
19411945
{
19421946
var bookmarkspr = new FlxSprite(str.x, (b.time * 40)).makeSolid(str.keyCount * 40, 4, bookmarkcolor);
19431947
bookmarkspr.updateHitbox();
1944-
bookmarkspr.camera = charterCamera;
1945-
add(bookmarkspr);
1948+
charterBookmarksGroup.add(bookmarkspr);
19461949
sprites.push(bookmarkspr);
19471950
}
19481951

19491952
var bookmarkText = new UIText(strumLines.members[0].x + 4, 0, 400, b.name, 15, bookmarkcolor, true);
19501953
bookmarkText.y = sprites[0].y - (bookmarkText.height + 2);
1951-
bookmarkText.camera = charterCamera;
1952-
add(bookmarkText);
1954+
charterBookmarksGroup.add(bookmarkText);
19531955

19541956
if (luminance < 0.5)
19551957
bookmarkText.borderColor = 0x88FFFFFF;

0 commit comments

Comments
 (0)