diff --git a/source/funkin/editors/charter/Charter.hx b/source/funkin/editors/charter/Charter.hx index d464b3e3..dd257318 100644 --- a/source/funkin/editors/charter/Charter.hx +++ b/source/funkin/editors/charter/Charter.hx @@ -906,7 +906,7 @@ class Charter extends UIState { if (true) { __crochet = ((60 / Conductor.bpm) * 1000); - if(FlxG.keys.justPressed.ANY) + if(FlxG.keys.justPressed.ANY && !strumLines.isDragging && this.currentFocus == null) UIUtil.processShortcuts(topMenu); if (FlxG.keys.pressed.CONTROL) { diff --git a/source/funkin/editors/ui/UISlider.hx b/source/funkin/editors/ui/UISlider.hx index 7968df41..5ef8c9bb 100644 --- a/source/funkin/editors/ui/UISlider.hx +++ b/source/funkin/editors/ui/UISlider.hx @@ -75,11 +75,11 @@ class UISlider extends UISprite { selectableHitbox.alpha = 0; members.push(selectableHitbox); - valueStepper = new UINumericStepper(x - 64 - 64, y, 1, 0.01, 2, segments[0].start, segments[segments.length-1].end, 0, 18); - valueStepper.antialiasing = true; + valueStepper = new UINumericStepper(x - 64 - 64, y, 1, 0.01, 2, segments[0].start, segments[segments.length-1].end, 0, 16); + valueStepper.antialiasing = valueStepper.label.antialiasing = true; valueStepper.onChange = function (text:String) { @:privateAccess valueStepper.__onChange(text); - value = valueStepper.value; + visualProgress = __barProgress = __calcProgress(value = valueStepper.value); } members.push(valueStepper); } @@ -87,8 +87,6 @@ class UISlider extends UISprite { var __barProgress:Float = 0; var visualProgress:Float = 0; - var __highLightTimer:Float = 0; - public override function update(elapsed:Float) { selectableHitbox.follow(this, 0, (height-selectableHitbox.height)/2); diff --git a/source/funkin/editors/ui/UITextBox.hx b/source/funkin/editors/ui/UITextBox.hx index 8c072e63..3aa97fd2 100644 --- a/source/funkin/editors/ui/UITextBox.hx +++ b/source/funkin/editors/ui/UITextBox.hx @@ -104,6 +104,7 @@ class UITextBox extends UISliceSprite implements IUIFocusable { switch(e) { case RETURN: focused = false; + if (onChange != null) onChange(label.text); case LEFT: changeSelection(-1); case RIGHT: