diff options
| author | Markus Sauermann <6299227+Sauermann@users.noreply.github.com> | 2022-10-17 00:59:51 +0200 |
|---|---|---|
| committer | Markus Sauermann <6299227+Sauermann@users.noreply.github.com> | 2022-12-07 09:54:29 +0100 |
| commit | e18107a57ccaf3d93a8893fe36f6d9010e2cdef1 (patch) | |
| tree | 3828f136f7dd6a96e8d9565438343ea0ab5f58e0 /platform/web | |
| parent | c241f1c52386b21cf2df936ee927740a06970db6 (diff) | |
Fix Determining Window for Touchscreen
DisplayServer::screen_is_touchscreen will likely never utilize its
parameter p_screen.
This PR replaces this function by DisplayServer::is_touchscreen_available()
with the same functionality.
This solves the problem, that a SubViewport was used for determining
the screen, which resulted in error messages.
Diffstat (limited to 'platform/web')
| -rw-r--r-- | platform/web/display_server_web.cpp | 4 | ||||
| -rw-r--r-- | platform/web/display_server_web.h | 2 |
2 files changed, 3 insertions, 3 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 diff --git a/platform/web/display_server_web.h b/platform/web/display_server_web.h index 1919736802..28e83474b9 100644 --- a/platform/web/display_server_web.h +++ b/platform/web/display_server_web.h @@ -143,7 +143,7 @@ public: virtual Point2i mouse_get_position() const override; // touch - virtual bool screen_is_touchscreen(int p_screen = SCREEN_OF_MAIN_WINDOW) const override; + virtual bool is_touchscreen_available() const override; // clipboard virtual void clipboard_set(const String &p_text) override; |