summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvolzhs <volzhs@gmail.com>2018-05-10 14:26:28 +0900
committervolzhs <volzhs@gmail.com>2018-05-10 14:26:28 +0900
commit99bc7f3f4e6f46bd3d00c0adcb63217c5f53d727 (patch)
tree11fccf893215008507e28776b971434ece87bcd5
parentfe82b5a1220a1948c03c92544a7e066cb0cd9057 (diff)
Fix setting for pointing emulation
Fix #18582 GLOBAL_DEF("input/something") is treated as Input Map setting, not as General.
-rw-r--r--main/main.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/main/main.cpp b/main/main.cpp
index 1c5540fd19..9c8474cb5b 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -1150,14 +1150,14 @@ Error Main::setup2(Thread::ID p_main_tid_override) {
InputDefault *id = Object::cast_to<InputDefault>(Input::get_singleton());
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()) {
//only if no touchscreen ui hint, set emulation
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");