diff --git a/source/funkin/editors/charter/CharterStrumline.hx b/source/funkin/editors/charter/CharterStrumline.hx index d08d14ff..fccf450f 100644 --- a/source/funkin/editors/charter/CharterStrumline.hx +++ b/source/funkin/editors/charter/CharterStrumline.hx @@ -125,14 +125,6 @@ class CharterStrumlineOptions extends UITopMenuButton { public override function openContextMenu() { contextMenu = [ - { - label: "Visible", - onSelect: function(_) { - strLine.strumLine.visible = !strLine.strumLine.visible; - }, - icon: strLine.strumLine.visible ? 1 : 0 - }, - null, { label: "Hitsounds", onSelect: function(_) { @@ -140,6 +132,13 @@ class CharterStrumlineOptions extends UITopMenuButton { }, icon: strLine.hitsounds ? 1 : 0 }, + { + label: "Mute Vocals", + onSelect: function(_) { + strLine.vocals.volume = strLine.vocals.volume > 0 ? 0 : 1; + }, + icon: strLine.vocals.volume > 0 ? 0 : 1 + }, null, { label: "Edit", @@ -156,14 +155,6 @@ class CharterStrumlineOptions extends UITopMenuButton { }, color: 0xFF982929, icon: 3 - }, - null, - { - label: "Mute Vocals", - onSelect: function(_) { - strLine.vocals.volume = strLine.vocals.volume > 0 ? 0 : 1; - }, - icon: strLine.vocals.volume > 0 ? 0 : 1 } ]; super.openContextMenu(); diff --git a/source/funkin/editors/charter/CharterStrumlineScreen.hx b/source/funkin/editors/charter/CharterStrumlineScreen.hx index 25784230..8e9422f7 100644 --- a/source/funkin/editors/charter/CharterStrumlineScreen.hx +++ b/source/funkin/editors/charter/CharterStrumlineScreen.hx @@ -17,6 +17,7 @@ class CharterStrumlineScreen extends UISubstateWindow { public var hudScaleStepper:UINumericStepper; public var hudXStepper:UINumericStepper; public var hudYStepper:UINumericStepper; + public var visibleCheckbox:UICheckbox; public var scrollSpeedStepper:UINumericStepper; public var usesChartscrollSpeed:UICheckbox; @@ -47,7 +48,7 @@ class CharterStrumlineScreen extends UISubstateWindow { }; winTitle = creatingStrumLine ? 'Creating strumline #$strumLineID' : 'Editing strumline #$strumLineID properties'; - winWidth = 690; winHeight = 390; + winWidth = 690; winHeight = 400; FlxG.sound.music.pause(); Charter.instance.vocals.pause(); @@ -63,7 +64,7 @@ class CharterStrumlineScreen extends UISubstateWindow { var charFileList = Character.getList(true); if (charFileList.length == 0) charFileList = Character.getList(false); - charactersList = new UIButtonList(15, title.y + title.height + 36, 250, 259, "", FlxPoint.get(250, 54), null, 0); + charactersList = new UIButtonList(15, title.y + title.height + 36, 250, 269, "", FlxPoint.get(250, 54), null, 0); charactersList.addButton.callback = () -> charactersList.add(new CharacterButton(0, 0, "New Char", charFileList, charactersList)); charactersList.cameraSpacing = 0; for (i in strumLine.characters) @@ -124,6 +125,9 @@ class CharterStrumlineScreen extends UISubstateWindow { hudYStepper = new UINumericStepper(hudXStepper.x + 84 - 32 + 26, hudXStepper.y, startingPos.y, 0.001, 2, null, null, 84); add(hudYStepper); + visibleCheckbox = new UICheckbox(hudYStepper.x + hudYStepper.bWidth + 42, hudYStepper.y + 9, "Visible?", strumLine.visible); + add(visibleCheckbox); + saveButton = new UIButton(windowSpr.x + windowSpr.bWidth - 20 - 125, windowSpr.y + windowSpr.bHeight - 16 - 32, "Save & Close", function() { saveStrumline(); close(); @@ -169,7 +173,7 @@ class CharterStrumlineScreen extends UISubstateWindow { type: typeDropdown.index, notes: strumLine.notes, position: ["DAD", "BOYFRIEND", "GIRLFRIEND"][stagePositionDropdown.index].toLowerCase(), - visible: strumLine.visible, + visible: visibleCheckbox.checked, strumPos: [0, hudYStepper.value], strumLinePos: hudXStepper.value, strumScale: hudScaleStepper.value,