diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-04-10 07:56:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-10 07:56:37 +0200 |
| commit | 7e2782e17732d1b690ccd151efaa65a52dc75aeb (patch) | |
| tree | 4fbacc9aea188494388268b8bce247eef7d4a57c /scene/gui/base_button.cpp | |
| parent | 866cb2805fd9f0d3346952e97156681170eb214c (diff) | |
| parent | dcf5be92a3aede861909c08d06b114669bbe75e8 (diff) | |
| download | redot-engine-7e2782e17732d1b690ccd151efaa65a52dc75aeb.tar.gz | |
Merge pull request #17081 from endragor/no-press-when-scroll
Make Button not emit press when container is scrolled
Diffstat (limited to 'scene/gui/base_button.cpp')
| -rw-r--r-- | scene/gui/base_button.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/gui/base_button.cpp b/scene/gui/base_button.cpp index 562dd155f9..dbfb96697d 100644 --- a/scene/gui/base_button.cpp +++ b/scene/gui/base_button.cpp @@ -252,7 +252,7 @@ void BaseButton::_notification(int p_what) { status.hovering = false; update(); } - if (p_what == NOTIFICATION_DRAG_BEGIN) { + if (p_what == NOTIFICATION_DRAG_BEGIN || p_what == NOTIFICATION_SCROLL_BEGIN) { if (status.press_attempt) { status.press_attempt = false; |