cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-09-12 05:07:06 +00:00
Code Issues Releases Wiki Activity

Merge pull request #228 from FunkinCrew/polish/chart-intro-screen

Browse source 
Polish/chart intro screen
This commit is contained in:
Cameron Taylor 2023-11-22 20:45:35 -05:00 committed by GitHub
parent ce11c6bde5 21d7046774
commit ecdb89c3a6
4 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assets

@ -1 +1 @@
Subproject commit 4ed2b3084d54899e10d10a97eaafe210158768be Subproject commit f715fd22cd51e71b017fae796cfe564b76dec20e

3
source/funkin/ui/debug/DebugMenuSubState.hx
View file

@ -8,6 +8,7 @@ import funkin.ui.TextMenuList;
import funkin.ui.debug.charting.ChartEditorState; import funkin.ui.debug.charting.ChartEditorState;
import funkin.ui.MusicBeatSubState; import funkin.ui.MusicBeatSubState;
import funkin.util.logging.CrashHandler; import funkin.util.logging.CrashHandler;
import flixel.addons.transition.FlxTransitionableState;
class DebugMenuSubState extends MusicBeatSubState class DebugMenuSubState extends MusicBeatSubState
{ {
@ -84,6 +85,8 @@ class DebugMenuSubState extends MusicBeatSubState
function openChartEditor() function openChartEditor()
{ {
FlxTransitionableState.skipNextTransIn = true;
FlxG.switchState(new ChartEditorState()); FlxG.switchState(new ChartEditorState());
} }

3
source/funkin/ui/debug/charting/ChartEditorState.hx
View file

@ -2956,9 +2956,10 @@ class ChartEditorState extends HaxeUIState
if (FlxG.mouse.justReleased) FlxG.sound.play(Paths.sound("chartingSounds/ClickUp")); if (FlxG.mouse.justReleased) FlxG.sound.play(Paths.sound("chartingSounds/ClickUp"));
// Note: If a menu is open in HaxeUI, don't handle cursor behavior. // Note: If a menu is open in HaxeUI, don't handle cursor behavior.
var shouldHandleCursor:Bool = !(isHaxeUIFocused || playbarHeadDragging) var shouldHandleCursor:Bool = !(isHaxeUIFocused || playbarHeadDragging || isHaxeUIDialogOpen)
|| (selectionBoxStartPos != null) || (selectionBoxStartPos != null)
|| (dragTargetNote != null || dragTargetEvent != null); || (dragTargetNote != null || dragTargetEvent != null);
var eventColumn:Int = (STRUMLINE_SIZE * 2 + 1) - 1; var eventColumn:Int = (STRUMLINE_SIZE * 2 + 1) - 1;
// trace('shouldHandleCursor: $shouldHandleCursor'); // trace('shouldHandleCursor: $shouldHandleCursor');

8
source/funkin/ui/debug/charting/handlers/ChartEditorDialogHandler.hx
View file

@ -101,7 +101,13 @@ class ChartEditorDialogHandler
if (chartPath == null) continue; if (chartPath == null) continue;
var linkRecentChart:Link = new Link(); var linkRecentChart:Link = new Link();
linkRecentChart.text = chartPath; // regex to only use the filename, not the full path
// "dadbattle.fnc" insted of "c:/user/docs/funkin/dadbattle.fnc"
// hovering tooltip shows full path
var fileNamePattern:EReg = new EReg("([^/\\\\]+)$", "");
var fileName:String = fileNamePattern.match(chartPath) ? fileNamePattern.matched(1) : chartPath;
linkRecentChart.text = fileName;
linkRecentChart.tooltip = chartPath;
linkRecentChart.onClick = function(_event) { linkRecentChart.onClick = function(_event) {
dialog.hideDialog(DialogButton.CANCEL); dialog.hideDialog(DialogButton.CANCEL);
state.stopWelcomeMusic(); state.stopWelcomeMusic();