diff options
| author | Yuri Sizov <11782833+YuriSizov@users.noreply.github.com> | 2023-03-27 16:03:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-27 16:03:26 +0200 |
| commit | 7d8398996c3c22ec7483dbbc17abaa509ef37701 (patch) | |
| tree | 7794785d9b76bee58e35a937814ba24632e8d6a1 | |
| parent | 61e4f91ea1ea3a0b55ec748a30db41fe19d2d157 (diff) | |
| parent | b78623dae601e065937b2f24dbe11aa0001dd1e8 (diff) | |
| download | redot-engine-7d8398996c3c22ec7483dbbc17abaa509ef37701.tar.gz | |
Merge pull request #75304 from Calinou/gridmap-editor-change-floor-ctrl-only
Only change floors in GridMap editor when holding Ctrl/Cmd, not Shift
| -rw-r--r-- | modules/gridmap/editor/grid_map_editor_plugin.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/gridmap/editor/grid_map_editor_plugin.cpp b/modules/gridmap/editor/grid_map_editor_plugin.cpp index 541a95ab6f..bb5eb8e643 100644 --- a/modules/gridmap/editor/grid_map_editor_plugin.cpp +++ b/modules/gridmap/editor/grid_map_editor_plugin.cpp @@ -608,13 +608,13 @@ EditorPlugin::AfterGUIInput GridMapEditor::forward_spatial_input_event(Camera3D Ref<InputEventMouseButton> mb = p_event; if (mb.is_valid()) { - if (mb->get_button_index() == MouseButton::WHEEL_UP && (mb->is_command_or_control_pressed() || mb->is_shift_pressed())) { + if (mb->get_button_index() == MouseButton::WHEEL_UP && (mb->is_command_or_control_pressed())) { if (mb->is_pressed()) { floor->set_value(floor->get_value() + mb->get_factor()); } return EditorPlugin::AFTER_GUI_INPUT_STOP; // Eaten. - } else if (mb->get_button_index() == MouseButton::WHEEL_DOWN && (mb->is_command_or_control_pressed() || mb->is_shift_pressed())) { + } else if (mb->get_button_index() == MouseButton::WHEEL_DOWN && (mb->is_command_or_control_pressed())) { if (mb->is_pressed()) { floor->set_value(floor->get_value() - mb->get_factor()); } @@ -753,7 +753,7 @@ EditorPlugin::AfterGUIInput GridMapEditor::forward_spatial_input_event(Camera3D Ref<InputEventPanGesture> pan_gesture = p_event; if (pan_gesture.is_valid()) { - if (pan_gesture->is_alt_pressed() && (pan_gesture->is_command_or_control_pressed() || pan_gesture->is_shift_pressed())) { + if (pan_gesture->is_alt_pressed() && pan_gesture->is_command_or_control_pressed()) { const real_t delta = pan_gesture->get_delta().y * 0.5; accumulated_floor_delta += delta; int step = 0; |