diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2022-12-07 13:24:06 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2022-12-07 13:24:06 +0100 |
| commit | eb1734c95d56c2017f5a215c56d56abefcedb4d9 (patch) | |
| tree | 33a8b3e6e3cdb471e786418b6d9a68d3732e57da /scene/2d/touch_screen_button.cpp | |
| parent | 04cd36612ae017a4daf9670a89eb2fafb54e2a8b (diff) | |
| parent | e18107a57ccaf3d93a8893fe36f6d9010e2cdef1 (diff) | |
Merge pull request #67554 from Sauermann/fix-determining-window-in-scroll-container
Remove Screen-parameter for determining Touchscreen capability
Diffstat (limited to 'scene/2d/touch_screen_button.cpp')
| -rw-r--r-- | scene/2d/touch_screen_button.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/2d/touch_screen_button.cpp b/scene/2d/touch_screen_button.cpp index a02f322ef1..e99821e9b9 100644 --- a/scene/2d/touch_screen_button.cpp +++ b/scene/2d/touch_screen_button.cpp @@ -100,7 +100,7 @@ void TouchScreenButton::_notification(int p_what) { if (!is_inside_tree()) { return; } - if (!Engine::get_singleton()->is_editor_hint() && !!DisplayServer::get_singleton()->screen_is_touchscreen(DisplayServer::get_singleton()->window_get_current_screen(get_viewport()->get_window_id())) && visibility == VISIBILITY_TOUCHSCREEN_ONLY) { + if (!Engine::get_singleton()->is_editor_hint() && !!DisplayServer::get_singleton()->is_touchscreen_available() && visibility == VISIBILITY_TOUCHSCREEN_ONLY) { return; } @@ -137,7 +137,7 @@ void TouchScreenButton::_notification(int p_what) { } break; case NOTIFICATION_ENTER_TREE: { - if (!Engine::get_singleton()->is_editor_hint() && !!DisplayServer::get_singleton()->screen_is_touchscreen(DisplayServer::get_singleton()->window_get_current_screen(get_viewport()->get_window_id())) && visibility == VISIBILITY_TOUCHSCREEN_ONLY) { + if (!Engine::get_singleton()->is_editor_hint() && !!DisplayServer::get_singleton()->is_touchscreen_available() && visibility == VISIBILITY_TOUCHSCREEN_ONLY) { return; } queue_redraw(); |