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/gui/scroll_bar.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/gui/scroll_bar.cpp')
| -rw-r--r-- | scene/gui/scroll_bar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/gui/scroll_bar.cpp b/scene/gui/scroll_bar.cpp index 6899178885..a44ddff507 100644 --- a/scene/gui/scroll_bar.cpp +++ b/scene/gui/scroll_bar.cpp @@ -550,7 +550,7 @@ void ScrollBar::_drag_node_input(const Ref<InputEvent> &p_input) { drag_node_accum = Vector2(); last_drag_node_accum = Vector2(); drag_node_from = Vector2(orientation == HORIZONTAL ? get_value() : 0, orientation == VERTICAL ? get_value() : 0); - drag_node_touching = DisplayServer::get_singleton()->screen_is_touchscreen(DisplayServer::get_singleton()->window_get_current_screen(get_viewport()->get_window_id())); + drag_node_touching = DisplayServer::get_singleton()->is_touchscreen_available(); drag_node_touching_deaccel = false; time_since_motion = 0; |