Skip to content

Add touch support to control nodes #118655

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
m4gr3d wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −15
Draft

Add touch support to control nodes #118655

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 12 additions & 15 deletions scene/gui/scroll_container.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,9 +189,11 @@ void ScrollContainer::gui_input(const Ref<InputEvent> &p_gui_input) {
bool h_scroll_enabled = horizontal_scroll_mode != SCROLL_MODE_DISABLED;
bool v_scroll_enabled = vertical_scroll_mode != SCROLL_MODE_DISABLED;

int event_device_id = p_gui_input->get_device();

Ref<InputEventMouseButton> mb = p_gui_input;

if (mb.is_valid()) {
if (mb.is_valid() && event_device_id != InputEvent::DEVICE_ID_EMULATION) {
if (mb->is_pressed()) {
bool scroll_value_modified = false;
bool swap_axes = scroll_horizontal_by_default != mb->is_shift_pressed();
Expand Down Expand Up @@ -243,17 +245,12 @@ void ScrollContainer::gui_input(const Ref<InputEvent> &p_gui_input) {
return;
}
}
return;
}

bool is_touchscreen_available = DisplayServer::get_singleton()->is_touchscreen_available();
if (!is_touchscreen_available) {
return;
}

if (mb->get_button_index() != MouseButton::LEFT) {
return;
}

if (mb->is_pressed()) {
Ref<InputEventScreenTouch> touch = p_gui_input;
if (touch.is_valid() && event_device_id != InputEvent::DEVICE_ID_EMULATION) {
if (touch->is_pressed()) {
if (drag_touching) {
_cancel_drag();
}
Expand All @@ -271,7 +268,7 @@ void ScrollContainer::gui_input(const Ref<InputEvent> &p_gui_input) {

} else {
if (drag_touching) {
if (drag_speed == Vector2()) {
if (touch->is_canceled() || drag_speed == Vector2()) {
_cancel_drag();
} else {
drag_touching_deaccel = true;
Expand All @@ -281,11 +278,11 @@ void ScrollContainer::gui_input(const Ref<InputEvent> &p_gui_input) {
return;
}

Ref<InputEventMouseMotion> mm = p_gui_input;
Ref<InputEventScreenDrag> drag = p_gui_input;

if (mm.is_valid()) {
if (drag.is_valid() && event_device_id != InputEvent::DEVICE_ID_EMULATION) {
if (drag_touching && !drag_touching_deaccel) {
Vector2 motion = mm->get_relative();
Vector2 motion = drag->get_relative();
drag_accum -= motion;

if (beyond_deadzone || (h_scroll_enabled && Math::abs(drag_accum.x) > deadzone) || (v_scroll_enabled && Math::abs(drag_accum.y) > deadzone)) {
Expand Down