diff options
| author | Pedro J. Estébanez | 2018-02-24 03:04:30 +0100 |
|---|---|---|
| committer | Pedro J. Estébanez | 2018-04-30 19:03:38 +0200 |
| commit | de9d40a9537bafa613dc54f2200b7509ad6fa9e3 (patch) | |
| tree | 746f887af7e07a5e89878500fc713cd5548409ac /core | |
| parent | 3a5b25d5b489ad88c2861c9c37b56469580fbf03 (diff) | |
| download | godot-de9d40a9537bafa613dc54f2200b7509ad6fa9e3.tar.gz godot-de9d40a9537bafa613dc54f2200b7509ad6fa9e3.tar.zst godot-de9d40a9537bafa613dc54f2200b7509ad6fa9e3.zip | |
Diffstat (limited to 'core')
| -rw-r--r-- | core/os/input.h | 3 | ||||
| -rw-r--r-- | core/os/os.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/core/os/input.h b/core/os/input.h index fca68f27b..b0d72a6d5 100644 --- a/core/os/input.h +++ b/core/os/input.h @@ -117,7 +117,8 @@ public: void get_argument_options(const StringName &p_function, int p_idx, List<String> *r_options) const; - virtual bool is_emulating_touchscreen() const = 0; + virtual bool is_emulating_touch_from_mouse() const = 0; + virtual bool is_emulating_mouse_from_touch() const = 0; virtual CursorShape get_default_cursor_shape() = 0; virtual void set_default_cursor_shape(CursorShape p_shape) = 0; diff --git a/core/os/os.cpp b/core/os/os.cpp index 618a4bbac..854d554b1 100644 --- a/core/os/os.cpp +++ b/core/os/os.cpp @@ -411,7 +411,7 @@ Error OS::set_cwd(const String &p_cwd) { bool OS::has_touchscreen_ui_hint() const { //return false; - return Input::get_singleton() && Input::get_singleton()->is_emulating_touchscreen(); + return Input::get_singleton() && Input::get_singleton()->is_emulating_touch_from_mouse(); } int OS::get_free_static_memory() const { |