diff options
| author | Marc Gilleron | 2016-04-12 03:37:35 +0200 |
|---|---|---|
| committer | Rémi Verschelde | 2016-04-27 08:44:40 +0200 |
| commit | f32a4dc516116f1f46f095d60ccfaac78b6e1fe3 (patch) | |
| tree | c35968484f5d87a81c7a36a573cecf61b58f5abc | |
| parent | a0b664585878429f42ac0aa17e8c0ff84b5d833a (diff) | |
| download | godot-f32a4dc516116f1f46f095d60ccfaac78b6e1fe3.tar.gz godot-f32a4dc516116f1f46f095d60ccfaac78b6e1fe3.tar.zst godot-f32a4dc516116f1f46f095d60ccfaac78b6e1fe3.zip | |
Made trackpad behaviour optional in 3D mode (issue #4265)
(cherry picked from commit 84d706cb356f4f00bedfa0bff265968b439385c8)
| -rw-r--r-- | tools/editor/editor_settings.cpp | 1 | ||||
| -rw-r--r-- | tools/editor/plugins/spatial_editor_plugin.cpp | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/tools/editor/editor_settings.cpp b/tools/editor/editor_settings.cpp index 707f38d6a..06c364567 100644 --- a/tools/editor/editor_settings.cpp +++ b/tools/editor/editor_settings.cpp @@ -528,6 +528,7 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) { set("3d_editor/zoom_modifier",4); hints["3d_editor/zoom_modifier"]=PropertyInfo(Variant::INT,"3d_editor/zoom_modifier",PROPERTY_HINT_ENUM,"None,Shift,Alt,Meta,Ctrl"); set("3d_editor/emulate_numpad",false); + set("3d_editor/trackpad_hint", false); set("2d_editor/bone_width",5); set("2d_editor/bone_color1",Color(1.0,1.0,1.0,0.9)); diff --git a/tools/editor/plugins/spatial_editor_plugin.cpp b/tools/editor/plugins/spatial_editor_plugin.cpp index dbf241a8b..f7de71187 100644 --- a/tools/editor/plugins/spatial_editor_plugin.cpp +++ b/tools/editor/plugins/spatial_editor_plugin.cpp @@ -1579,7 +1579,8 @@ void SpatialEditorViewport::_sinput(const InputEvent &p_event) { if (m.mod.alt) nav_mode = NAVIGATION_PAN; } - }else{ + + } else if (EditorSettings::get_singleton()->get("3d_editor/trackpad_hint")) { // Handle trackpad (no external mouse) use case int mod = 0; if (m.mod.shift) |