diff --git a/source/funkin/editors/character/CharacterEditor.hx b/source/funkin/editors/character/CharacterEditor.hx index 7d97dd25..a2f1d0c9 100644 --- a/source/funkin/editors/character/CharacterEditor.hx +++ b/source/funkin/editors/character/CharacterEditor.hx @@ -262,11 +262,14 @@ class CharacterEditor extends UIState { var pos = FlxG.mouse.getScreenPosition(charCamera); pos *= camDragSpeed; nextScroll.set((camDrag.x - pos.x), (camDrag.y - pos.y)); - } + + currentCursor = HAND; + } else + currentCursor = ARROW; charCamera.scroll.set( - lerp(charCamera.scroll.x, nextScroll.x, 0.25), - lerp(charCamera.scroll.y, nextScroll.y, 0.25) + lerp(charCamera.scroll.x, nextScroll.x, 0.35), + lerp(charCamera.scroll.y, nextScroll.y, 0.35) ); charCamera.zoom = lerp(charCamera.zoom, __camZoom, 0.125); diff --git a/source/funkin/editors/ui/UIState.hx b/source/funkin/editors/ui/UIState.hx index d287e630..5283447f 100644 --- a/source/funkin/editors/ui/UIState.hx +++ b/source/funkin/editors/ui/UIState.hx @@ -8,6 +8,7 @@ import funkin.editors.ui.UIContextMenu.UIContextMenuCallback; import openfl.ui.Mouse; import funkin.editors.ui.UIContextMenu.UIContextMenuOption; import flixel.math.FlxPoint; +import openfl.ui.MouseCursor; import flixel.math.FlxRect; class UIState extends MusicBeatState { @@ -20,6 +21,8 @@ class UIState extends MusicBeatState { public var hoveredSprite:UISprite = null; public var currentFocus:IUIFocusable = null; + public var currentCursor:MouseCursor = ARROW; + private var __rect:FlxRect; private var __mousePos:FlxPoint; @@ -105,7 +108,7 @@ class UIState extends MusicBeatState { Mouse.cursor = hoveredSprite.cursor; hoveredSprite = null; } else { - Mouse.cursor = ARROW; + Mouse.cursor = currentCursor; } }