Skip to content

Commit

Permalink
Merge pull request #71903 from Calinou/touch-emulation-project-settin…
Browse files Browse the repository at this point in the history
…gs-basic

Mark touch emulation project settings as basic
  • Loading branch information
akien-mga committed Jan 23, 2023
2 parents 35c37ce + 33e9dff commit 528f044
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions main/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2165,15 +2165,15 @@ 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
id->set_emulate_touch_from_mouse(true);
}
}

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");
Expand Down

0 comments on commit 528f044

Please sign in to comment.