diff --git a/src/Palette/PaletteScroll.gd b/src/Palette/PaletteScroll.gd index 0d0dec396..c3c2156a0 100644 --- a/src/Palette/PaletteScroll.gd +++ b/src/Palette/PaletteScroll.gd @@ -90,3 +90,4 @@ func _on_PaletteScroll_gui_input(event: InputEvent) -> void: return resize_grid() set_sliders(palette_grid.current_palette, palette_grid.grid_window_origin + scroll_vector) + get_window().set_input_as_handled() diff --git a/src/UI/Nodes/ValueSlider.gd b/src/UI/Nodes/ValueSlider.gd index 9d9a4a508..8d9a8cbad 100644 --- a/src/UI/Nodes/ValueSlider.gd +++ b/src/UI/Nodes/ValueSlider.gd @@ -80,15 +80,21 @@ func _notification(what: int) -> void: _reset_display(false) -func _input(event: InputEvent) -> void: +func _unhandled_input(event: InputEvent) -> void: if not editable or not is_visible_in_tree(): return - if event.is_action_pressed(global_increment_action, true): + if ( + not global_increment_action.is_empty() + and event.is_action_pressed(global_increment_action, true) + ): if snap_by_default: value += step if event.ctrl_pressed else snap_step else: value += snap_step if event.ctrl_pressed else step - elif event.is_action_pressed(global_decrement_action, true): + elif ( + not global_decrement_action.is_empty() + and event.is_action_pressed(global_decrement_action, true) + ): if snap_by_default: value -= step if event.ctrl_pressed else snap_step else: diff --git a/src/UI/Timeline/AnimationTimeline.gd b/src/UI/Timeline/AnimationTimeline.gd index 2b126738d..490f4fb2a 100644 --- a/src/UI/Timeline/AnimationTimeline.gd +++ b/src/UI/Timeline/AnimationTimeline.gd @@ -141,6 +141,7 @@ func _input(event: InputEvent) -> void: if timeline_rect.has_point(mouse_pos): if Input.is_key_pressed(KEY_CTRL): cel_size += (2 * int(event.is_action("zoom_in")) - 2 * int(event.is_action("zoom_out"))) + get_viewport().set_input_as_handled() func reset_settings() -> void: