summaryrefslogtreecommitdiff
path: root/platform/web/display_server_web.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2022-12-07 13:24:06 +0100
committerRémi Verschelde <rverschelde@gmail.com>2022-12-07 13:24:06 +0100
commiteb1734c95d56c2017f5a215c56d56abefcedb4d9 (patch)
tree33a8b3e6e3cdb471e786418b6d9a68d3732e57da /platform/web/display_server_web.cpp
parent04cd36612ae017a4daf9670a89eb2fafb54e2a8b (diff)
parente18107a57ccaf3d93a8893fe36f6d9010e2cdef1 (diff)
Merge pull request #67554 from Sauermann/fix-determining-window-in-scroll-container
Remove Screen-parameter for determining Touchscreen capability
Diffstat (limited to 'platform/web/display_server_web.cpp')
-rw-r--r--platform/web/display_server_web.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/web/display_server_web.cpp b/platform/web/display_server_web.cpp
index f704124704..180baff02e 100644
--- a/platform/web/display_server_web.cpp
+++ b/platform/web/display_server_web.cpp
@@ -579,8 +579,8 @@ void DisplayServerWeb::touch_callback(int p_type, int p_count) {
}
}
-bool DisplayServerWeb::screen_is_touchscreen(int p_screen) const {
- return godot_js_display_touchscreen_is_available();
+bool DisplayServerWeb::is_touchscreen_available() const {
+ return godot_js_display_touchscreen_is_available() || (Input::get_singleton() && Input::get_singleton()->is_emulating_touch_from_mouse());
}
// Virtual Keyboard