godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Merge pull request #101246 from wlsnmrk/dropdown-fix 

Fix menus and dropdowns requiring two clicks
This commit is contained in:
Rémi Verschelde 2025-01-08 18:20:07 +01:00
parent 21721ae344 5fad891759
commit bfa351cb44
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scene/gui/base_button.cpp
View File

@ -151,12 +151,14 @@ void BaseButton::_toggled(bool p_pressed) {
void BaseButton::on_action_event(Ref<InputEvent> p_event) { void BaseButton::on_action_event(Ref<InputEvent> p_event) {
Ref<InputEventMouseButton> mouse_button = p_event; Ref<InputEventMouseButton> mouse_button = p_event;
if (!status.pressed_down_with_focus && p_event->is_pressed() && (mouse_button.is_null() || status.hovering)) { if (p_event->is_pressed() && (mouse_button.is_null() || status.hovering)) {
status.press_attempt = true; status.press_attempt = true;
status.pressing_inside = true; status.pressing_inside = true;
if (!status.pressed_down_with_focus) {
status.pressed_down_with_focus = true; status.pressed_down_with_focus = true;
emit_signal(SNAME("button_down")); emit_signal(SNAME("button_down"));
} }
}
if (status.press_attempt && status.pressing_inside) { if (status.press_attempt && status.pressing_inside) {
if (toggle_mode) { if (toggle_mode) {
@ -181,12 +183,14 @@ void BaseButton::on_action_event(Ref<InputEvent> p_event) {
} }
} }
if (status.pressed_down_with_focus && !p_event->is_pressed()) { if (!p_event->is_pressed()) {
status.press_attempt = false; status.press_attempt = false;
status.pressing_inside = false; status.pressing_inside = false;
if (status.pressed_down_with_focus) {
status.pressed_down_with_focus = false; status.pressed_down_with_focus = false;
emit_signal(SNAME("button_up")); emit_signal(SNAME("button_up"));
} }
}
queue_redraw(); queue_redraw();
} }