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

Merge pull request #18755 from volzhs/fix-pointing-emulate 

Fix setting for pointing emulation
This commit is contained in:
Max Hilbrunner 2018-05-10 14:57:24 +02:00 committed by GitHub
parent fe82b5a122 99bc7f3f4e
commit b72424c88b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main/main.cpp
View File

@ -1150,14 +1150,14 @@ Error Main::setup2(Thread::ID p_main_tid_override) {
InputDefault *id = Object::cast_to<InputDefault>(Input::get_singleton()); InputDefault *id = Object::cast_to<InputDefault>(Input::get_singleton());
if (id) { if (id) {
if (bool(GLOBAL_DEF("input/pointing_devices/emulate_touch_from_mouse", false)) && !(editor || project_manager)) { if (bool(GLOBAL_DEF("input_devices/pointing/emulate_touch_from_mouse", false)) && !(editor || project_manager)) {
if (!OS::get_singleton()->has_touchscreen_ui_hint()) { if (!OS::get_singleton()->has_touchscreen_ui_hint()) {
//only if no touchscreen ui hint, set emulation //only if no touchscreen ui hint, set emulation
id->set_emulate_touch_from_mouse(true); id->set_emulate_touch_from_mouse(true);
} }
} }
id->set_emulate_mouse_from_touch(bool(GLOBAL_DEF("input/pointing_devices/emulate_mouse_from_touch", true))); id->set_emulate_mouse_from_touch(bool(GLOBAL_DEF("input_devices/pointing/emulate_mouse_from_touch", true)));
} }
MAIN_PRINT("Main: Load Remaps"); MAIN_PRINT("Main: Load Remaps");