godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made trackpad behaviour optional in 3D mode (issue #4265) 

(cherry picked from commit 84d706cb35)
This commit is contained in:
Marc Gilleron 2016-04-12 03:37:35 +02:00 committed by Rémi Verschelde
parent a0b6645858
commit f32a4dc516
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tools/editor/editor_settings.cpp
View File

@ -528,6 +528,7 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
set("3d_editor/zoom_modifier",4); 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"); 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/emulate_numpad",false);
set("3d_editor/trackpad_hint", false);
set("2d_editor/bone_width",5); set("2d_editor/bone_width",5);
set("2d_editor/bone_color1",Color(1.0,1.0,1.0,0.9)); set("2d_editor/bone_color1",Color(1.0,1.0,1.0,0.9));

3
tools/editor/plugins/spatial_editor_plugin.cpp
View File

@ -1579,7 +1579,8 @@ void SpatialEditorViewport::_sinput(const InputEvent &p_event) {
if (m.mod.alt) if (m.mod.alt)
nav_mode = NAVIGATION_PAN; nav_mode = NAVIGATION_PAN;
} }
}else{
} else if (EditorSettings::get_singleton()->get("3d_editor/trackpad_hint")) {
// Handle trackpad (no external mouse) use case // Handle trackpad (no external mouse) use case
int mod = 0; int mod = 0;
if (m.mod.shift) if (m.mod.shift)