Merge pull request #97649 from ohboh/literally-unusable-on-mobile-without-this

Repiteo · Repiteo · commit 6ec3dc1fb550 · 2024-10-21T16:39:26.000-05:00
Fix `emulate_mouse_from_touch` setting affecting editor
diff --git a/main/main.cpp b/main/main.cpp
@@ -3201,6 +3201,10 @@ Error Main::setup2(bool p_show_boot_logo) {
 			}
 
 			id->set_emulate_mouse_from_touch(bool(GLOBAL_DEF_BASIC("input_devices/pointing/emulate_mouse_from_touch", true)));
+
+			if (editor) {
+				id->set_emulate_mouse_from_touch(true);
+			}
 		}
 
 		OS::get_singleton()->benchmark_end_measure("Startup", "Setup Window and Boot");

Original file line number	Diff line number	Diff line change
`@@ -3201,6 +3201,10 @@ Error Main::setup2(bool p_show_boot_logo) {`
`3201`	`3201`	`}`
`3202`	`3202`
`3203`	`3203`	`id->set_emulate_mouse_from_touch(bool(GLOBAL_DEF_BASIC("input_devices/pointing/emulate_mouse_from_touch", true)));`
	`3204`	`+`
	`3205`	`+ if (editor) {`
	`3206`	`+ id->set_emulate_mouse_from_touch(true);`
	`3207`	`+ }`
`3204`	`3208`	`}`
`3205`	`3209`
`3206`	`3210`	`OS::get_singleton()->benchmark_end_measure("Startup", "Setup Window and Boot");`