From 1e65916241037d559f27c5d3c81fbf4f5d57884f Mon Sep 17 00:00:00 2001 From: Alexey Kashlakov <42632842+Leytak@users.noreply.github.com> Date: Fri, 14 Sep 2018 14:21:58 +0700 Subject: [PATCH] Discard button pressing flags on disable Is it a bug? 1) Click the button and hold 2) Disable it (for example I bind this action on keyboard) 3) Release the mouse and move it outside the button 4) Enable the button 5) It's still pressed, but shouldn't --- scene/gui/base_button.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scene/gui/base_button.cpp b/scene/gui/base_button.cpp index 59590ea67b5..7bba36f9578 100644 --- a/scene/gui/base_button.cpp +++ b/scene/gui/base_button.cpp @@ -315,6 +315,14 @@ void BaseButton::set_disabled(bool p_disabled) { return; status.disabled = p_disabled; + if (p_disabled) { + if (!toggle_mode) { + status.pressed = false; + } + status.press_attempt = false; + status.pressing_inside = false; + status.pressing_button = 0; + } update(); _change_notify("disabled"); }