Merge branch 'main' into options-rewrite
This commit is contained in:
@@ -214,6 +214,8 @@ class Flags {
|
||||
public static var DEFAULT_EDITOR_TEXTTYPE_SOUND = "editors/textType";
|
||||
public static var DEFAULT_EDITOR_UNDO_SOUND = "editors/undo";
|
||||
public static var DEFAULT_EDITOR_WINDOWAPPEAR_SOUND = "editors/windowAppear";
|
||||
public static var DEFAULT_EDITOR_WINDOWCLOSE_SOUND = "editors/windowClose";
|
||||
public static var DEFAULT_EDITOR_DROPDOWNAPPEAR_SOUND = "editors/dropdownAppear";
|
||||
public static var DEFAULT_CHARTER_HITSOUND_SOUND = "editors/charter/hitsound";
|
||||
public static var DEFAULT_CHARTER_METRONOME_SOUND = "editors/charter/metronome";
|
||||
public static var DEFAULT_CHARTER_NOTEDELETE_SOUND = "editors/charter/noteDelete";
|
||||
|
||||
@@ -87,6 +87,7 @@ class UIDropDown extends UISliceSprite {
|
||||
}
|
||||
|
||||
public function openContextMenu() {
|
||||
FlxG.sound.play(Paths.sound(Flags.DEFAULT_EDITOR_DROPDOWNAPPEAR_SOUND));
|
||||
var screenPos = getScreenPosition(null, __lastDrawCameras[0] == null ? FlxG.camera : __lastDrawCameras[0]);
|
||||
curMenu = UIState.state.openContextMenu([
|
||||
for(k=>o in items) {
|
||||
|
||||
@@ -147,6 +147,7 @@ class UIState extends MusicBeatState {
|
||||
}
|
||||
|
||||
public function closeCurrentContextMenu() {
|
||||
FlxG.sound.play(Paths.sound(Flags.DEFAULT_EDITOR_WINDOWCLOSE_SOUND));
|
||||
if(curContextMenu != null) {
|
||||
curContextMenu.close();
|
||||
curContextMenu = null;
|
||||
|
||||
@@ -86,6 +86,7 @@ class UISubstateWindow extends MusicBeatSubstate {
|
||||
}
|
||||
|
||||
public override function destroy() {
|
||||
FlxG.sound.play(Paths.sound(Flags.DEFAULT_EDITOR_WINDOWCLOSE_SOUND));
|
||||
super.destroy();
|
||||
for(e in camShaders)
|
||||
e.removeShader(blurShader);
|
||||
|
||||
Reference in New Issue
Block a user