fix lime ver

This commit is contained in:
lunarcleint
2023-10-21 13:17:00 -07:00
parent 912612d792
commit 643cdc1901
2 changed files with 40 additions and 34 deletions
+1 -1
View File
@@ -2,7 +2,7 @@
<libraries> <libraries>
<!-- OpenFL & Lime (Required for Flixel) --> <!-- OpenFL & Lime (Required for Flixel) -->
<lib name="openfl" /> <lib name="openfl" />
<lib name="lime" /> <lib name="lime" version="8.0.2"/>
<!-- Flixel --> <!-- Flixel -->
<git name="flixel" url="https://github.com/FNF-CNE-Devs/flixel" /> <git name="flixel" url="https://github.com/FNF-CNE-Devs/flixel" />
+38 -32
View File
@@ -52,7 +52,9 @@ class Charter extends UIState {
public var gridBackdrops:CharterBackdropGroup; public var gridBackdrops:CharterBackdropGroup;
public var eventsBackdrop:EventBackdrop; public var eventsBackdrop:EventBackdrop;
public var addEventSpr:CharterEventAdd; public var addEventSpr:CharterEventAdd;
public var gridBackdropDummy:CharterBackdropDummy; public var gridBackdropDummy:CharterBackdropDummy;
public var noteHoverer:CharterNote;
public var strumlineInfoBG:FlxSprite; public var strumlineInfoBG:FlxSprite;
public var strumlineAddButton:CharterStrumlineButton; 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", label: "Note",
childs: [ 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", label: "Playback",
childs: [ childs: [
@@ -360,6 +362,9 @@ class Charter extends UIState {
selectionBox.scrollFactor.set(1, 1); selectionBox.scrollFactor.set(1, 1);
selectionBox.incorporeal = true; selectionBox.incorporeal = true;
noteHoverer = new CharterNote();
noteHoverer.visible = false;
selectionBox.cameras = notesGroup.cameras = gridBackdrops.cameras = [charterCamera]; selectionBox.cameras = notesGroup.cameras = gridBackdrops.cameras = [charterCamera];
topMenuSpr = new UITopMenu(topMenu); topMenuSpr = new UITopMenu(topMenu);
@@ -410,6 +415,7 @@ class Charter extends UIState {
add(addEventSpr); add(addEventSpr);
add(eventsGroup); add(eventsGroup);
add(notesGroup); add(notesGroup);
add(noteHoverer);
add(selectionBox); add(selectionBox);
add(strumlineInfoBG); add(strumlineInfoBG);
add(strumlineLockButton); add(strumlineLockButton);
@@ -898,7 +904,7 @@ class Charter extends UIState {
if (topMenuSpr.members[5] != null) { if (topMenuSpr.members[5] != null) {
var playBackMenu:UITopMenuButton = cast topMenuSpr.members[5]; var playBackMenu:UITopMenuButton = cast topMenuSpr.members[5];
playBackMenu.x = playBackSlider.x-playBackSlider.startText.width-10-playBackSlider.valueStepper.bWidth-playBackMenu.bWidth-10; 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); super.update(elapsed);