diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-01-23 11:07:00 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-01-23 11:07:00 +0100 |
| commit | 528f04458136543b1b1858a64ab62a91cd72405b (patch) | |
| tree | 2fddf72f40e3af8c0b012a62c3d36ddcbcf6b0f7 /main | |
| parent | 35c37ce4ce5d1559ae4548ebb2c0c7286cb90a3d (diff) | |
| parent | 33e9dff3ded26f6ae4532b2e8da5eb98af147a81 (diff) | |
Merge pull request #71903 from Calinou/touch-emulation-project-settings-basic
Mark touch emulation project settings as basic
Diffstat (limited to 'main')
| -rw-r--r-- | main/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/main.cpp b/main/main.cpp index 2326e519bf..cfde124b90 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -2165,7 +2165,7 @@ Error Main::setup2(Thread::ID p_main_tid_override) { if (id) { agile_input_event_flushing = GLOBAL_DEF("input_devices/buffering/agile_event_flushing", false); - if (bool(GLOBAL_DEF("input_devices/pointing/emulate_touch_from_mouse", false)) && + if (bool(GLOBAL_DEF_BASIC("input_devices/pointing/emulate_touch_from_mouse", false)) && !(editor || project_manager)) { if (!DisplayServer::get_singleton()->is_touchscreen_available()) { //only if no touchscreen ui hint, set emulation @@ -2173,7 +2173,7 @@ Error Main::setup2(Thread::ID p_main_tid_override) { } } - id->set_emulate_mouse_from_touch(bool(GLOBAL_DEF("input_devices/pointing/emulate_mouse_from_touch", true))); + id->set_emulate_mouse_from_touch(bool(GLOBAL_DEF_BASIC("input_devices/pointing/emulate_mouse_from_touch", true))); } MAIN_PRINT("Main: Load Translations and Remaps"); |