Skip to content

Fix mousewheel zoom blocked by FloatEdit in some cases #1615

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
williamchange wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix mousewheel zoom blocked by FloatEdit in some cases #1615

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 9 additions & 11 deletions material_maker/widgets/float_edit/float_edit.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,15 +362,13 @@ func _exit_tree() -> void:
mm_globals.set_config("ui_field_sensitivity", sensitivity)

func _handle_sensitivity_adjustment(event : InputEvent) -> void:
if mode == Modes.SLIDING:
if mode == Modes.SLIDING and Input.is_mouse_button_pressed(MOUSE_BUTTON_LEFT):
adjust_increment = 0.05 if event.alt_pressed else 0.1
if event is InputEventMouseButton:
if event.pressed:
if event.button_index == MOUSE_BUTTON_WHEEL_DOWN:
_update_sensitivity(-1.0)
elif event.button_index == MOUSE_BUTTON_WHEEL_UP:
_update_sensitivity(1.0)
else:
if event.button_index == MOUSE_BUTTON_LEFT:
adjusting_sensitivity = false
$Edit.queue_redraw()
if event is InputEventMouseButton and event.pressed:
if event.button_index == MOUSE_BUTTON_WHEEL_DOWN:
_update_sensitivity(-1.0)
elif event.button_index == MOUSE_BUTTON_WHEEL_UP:
_update_sensitivity(1.0)
elif adjusting_sensitivity:
adjusting_sensitivity = false
$Edit.queue_redraw()
Loading