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

Renamed Trackpad Hint to Emulate 3 Button Mouse. (#5258)

This commit is contained in:
sunnystormy 2016-06-21 06:16:06 -04:00 committed by Rémi Verschelde
parent 029ca80dca
commit b3b1fdae85
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/editor/editor_settings.cpp
View File

@ -583,7 +583,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("3d_editor/emulate_3_button_mouse", 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));

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

@ -1580,7 +1580,7 @@ void SpatialEditorViewport::_sinput(const InputEvent &p_event) {
nav_mode = NAVIGATION_PAN; nav_mode = NAVIGATION_PAN;
} }
} else if (EditorSettings::get_singleton()->get("3d_editor/trackpad_hint")) { } else if (EditorSettings::get_singleton()->get("3d_editor/emulate_3_button_mouse")) {
// 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)