gabry/Funkin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adds !isCursorOverHaxeUI around

Browse Source
This commit is contained in:
Cameron Taylor
2023-12-10 04:10:57 -05:00
parent 3a70ca4e08
commit c3fa793d97
1 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/funkin/ui/debug/charting/ChartEditorState.hx
+24 -21
View File
@@ -3409,7 +3409,7 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
{
gridPlayheadScrollAreaPressed = true;
}
else if (notePreview != null && FlxG.mouse.overlaps(notePreview))
else if (notePreview != null && !isCursorOverHaxeUI && FlxG.mouse.overlaps(notePreview))
{
// Clicked note preview
notePreviewScrollAreaStartPos = new FlxPoint(FlxG.mouse.screenX, FlxG.mouse.screenY);
@@ -3861,7 +3861,7 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
if (FlxG.mouse.justPressed)
{
// Just clicked to place a note.
if (overlapsGrid && !overlapsSelectionBorder)
if (!isCursorOverHaxeUI && overlapsGrid && !overlapsSelectionBorder)
{
// We clicked on the grid without moving the mouse.
@@ -4006,7 +4006,7 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
var isOrWillSelect = overlapsSelection || dragTargetNote != null || dragTargetEvent != null;
// Handle grid cursor.
if (overlapsGrid && !isOrWillSelect && !overlapsSelectionBorder && !gridPlayheadScrollAreaPressed)
if (!isCursorOverHaxeUI && overlapsGrid && !isOrWillSelect && !overlapsSelectionBorder && !gridPlayheadScrollAreaPressed)
{
// Indicate that we can place a note here.
@@ -4077,25 +4077,28 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
}
else
{
if (notePreview != null && FlxG.mouse.overlaps(notePreview))
if (!isCursorOverHaxeUI)
{
targetCursorMode = Pointer;
}
else if (gridPlayheadScrollArea != null && FlxG.mouse.overlaps(gridPlayheadScrollArea))
{
targetCursorMode = Pointer;
}
else if (overlapsSelection)
{
targetCursorMode = Pointer;
}
else if (overlapsSelectionBorder)
{
targetCursorMode = Crosshair;
}
else if (overlapsGrid)
{
targetCursorMode = Cell;
if (notePreview != null && FlxG.mouse.overlaps(notePreview))
{
targetCursorMode = Pointer;
}
else if (gridPlayheadScrollArea != null && FlxG.mouse.overlaps(gridPlayheadScrollArea))
{
targetCursorMode = Pointer;
}
else if (overlapsSelection)
{
targetCursorMode = Pointer;
}
else if (overlapsSelectionBorder)
{
targetCursorMode = Crosshair;
}
else if (overlapsGrid)
{
targetCursorMode = Cell;
}
}
}
}