From 643cdc1901892bc89dadbe5b93ac29a4ca2060cb Mon Sep 17 00:00:00 2001 From: lunarcleint <88809950+lunarcleint@users.noreply.github.com> Date: Sat, 21 Oct 2023 13:17:00 -0700 Subject: [PATCH] fix lime ver --- libs.xml | 4 +- source/funkin/editors/charter/Charter.hx | 70 +++++++++++++----------- 2 files changed, 40 insertions(+), 34 deletions(-) diff --git a/libs.xml b/libs.xml index 70e72592..b6e8f998 100644 --- a/libs.xml +++ b/libs.xml @@ -2,7 +2,7 @@ - + @@ -19,4 +19,4 @@ - + \ No newline at end of file diff --git a/source/funkin/editors/charter/Charter.hx b/source/funkin/editors/charter/Charter.hx index e04119e8..882b50ea 100644 --- a/source/funkin/editors/charter/Charter.hx +++ b/source/funkin/editors/charter/Charter.hx @@ -52,7 +52,9 @@ class Charter extends UIState { public var gridBackdrops:CharterBackdropGroup; public var eventsBackdrop:EventBackdrop; public var addEventSpr:CharterEventAdd; + public var gridBackdropDummy:CharterBackdropDummy; + public var noteHoverer:CharterNote; public var strumlineInfoBG:FlxSprite; public var strumlineAddButton:CharterStrumlineButton; @@ -213,6 +215,37 @@ class Charter extends UIState { } ] }, + { + label: "View", + childs: [ + { + label: "Zoom in", + keybind: [CONTROL, NUMPADPLUS], + onSelect: _view_zoomin + }, + { + label: "Zoom out", + keybind: [CONTROL, NUMPADMINUS], + onSelect: _view_zoomout + }, + { + label: "Reset zoom", + keybind: [CONTROL, NUMPADZERO], + onSelect: _view_zoomreset + }, + null, + { + label: 'Show Sections Separator', + onSelect: _view_showeventSecSeparator, + icon: Options.charterShowSections ? 1 : 0 + }, + { + label: 'Show Beats Separator', + onSelect: _view_showeventBeatSeparator, + icon: Options.charterShowBeats ? 1 : 0 + } + ] + }, { label: "Note", childs: [ @@ -248,37 +281,6 @@ class Charter extends UIState { } ] }, - { - label: "View", - childs: [ - { - label: "Zoom in", - keybind: [CONTROL, NUMPADPLUS], - onSelect: _view_zoomin - }, - { - label: "Zoom out", - keybind: [CONTROL, NUMPADMINUS], - onSelect: _view_zoomout - }, - { - label: "Reset zoom", - keybind: [CONTROL, NUMPADZERO], - onSelect: _view_zoomreset - }, - null, - { - label: 'Show Sections Separator', - onSelect: _view_showeventSecSeparator, - icon: Options.charterShowSections ? 1 : 0 - }, - { - label: 'Show Beats Separator', - onSelect: _view_showeventBeatSeparator, - icon: Options.charterShowBeats ? 1 : 0 - } - ] - }, { label: "Playback", childs: [ @@ -360,6 +362,9 @@ class Charter extends UIState { selectionBox.scrollFactor.set(1, 1); selectionBox.incorporeal = true; + noteHoverer = new CharterNote(); + noteHoverer.visible = false; + selectionBox.cameras = notesGroup.cameras = gridBackdrops.cameras = [charterCamera]; topMenuSpr = new UITopMenu(topMenu); @@ -410,6 +415,7 @@ class Charter extends UIState { add(addEventSpr); add(eventsGroup); add(notesGroup); + add(noteHoverer); add(selectionBox); add(strumlineInfoBG); add(strumlineLockButton); @@ -898,7 +904,7 @@ class Charter extends UIState { if (topMenuSpr.members[5] != null) { var playBackMenu:UITopMenuButton = cast topMenuSpr.members[5]; playBackMenu.x = playBackSlider.x-playBackSlider.startText.width-10-playBackSlider.valueStepper.bWidth-playBackMenu.bWidth-10; - playBackMenu.label.offset.x = -2; + playBackMenu.label.offset.x = -1; } super.update(elapsed);