From 9a82e4515798e8ec8d5641eea0de8f3062ed0a34 Mon Sep 17 00:00:00 2001 From: Rodz Labs Date: Sat, 3 Jul 2021 14:12:02 +0200 Subject: [PATCH] Moved zoom to wheel and scroll to control+wheel (#210) --- .../panels/graph_edit/graph_edit.gd | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/material_maker/panels/graph_edit/graph_edit.gd b/material_maker/panels/graph_edit/graph_edit.gd index b688179e..b768e021 100644 --- a/material_maker/panels/graph_edit/graph_edit.gd +++ b/material_maker/panels/graph_edit/graph_edit.gd @@ -55,12 +55,20 @@ func _gui_input(event) -> void: if selected_nodes.size() == 1 and selected_nodes[0].generator is MMGenGraph: update_view(selected_nodes[0].generator) elif event is InputEventMouseButton: - if event.button_index == BUTTON_WHEEL_UP and event.is_pressed() and event.control: - call_deferred("set_scroll_ofs", scroll_offset) - zoom *= 1.1 - elif event.button_index == BUTTON_WHEEL_DOWN and event.is_pressed() and event.control: - call_deferred("set_scroll_ofs", scroll_offset) - zoom /= 1.1 + if event.button_index == BUTTON_WHEEL_UP and event.is_pressed(): + if event.control: + event.control = false + elif !event.shift: + event.control = true + call_deferred("set_scroll_ofs", scroll_offset) + zoom *= 1.1 + elif event.button_index == BUTTON_WHEEL_DOWN and event.is_pressed(): + if event.control: + event.control = false + elif !event.shift: + event.control = true + call_deferred("set_scroll_ofs", scroll_offset) + zoom /= 1.1 else: call_deferred("check_last_selected") elif event is InputEventKey and event.pressed: