mirror of https://github.com/godotengine/godot
Fix OptionButton::show_popup
This commit is contained in:
parent
1b7b009674
commit
25fd115957
|
|
@ -468,12 +468,6 @@ void OptionButton::show_popup() {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
Rect2 rect = get_screen_rect();
|
|
||||||
rect.position.y += rect.size.height;
|
|
||||||
rect.size.height = 0;
|
|
||||||
popup->set_position(rect.position);
|
|
||||||
popup->set_size(rect.size);
|
|
||||||
|
|
||||||
// If not triggered by the mouse, start the popup with the checked item (or the first enabled one) focused.
|
// If not triggered by the mouse, start the popup with the checked item (or the first enabled one) focused.
|
||||||
if (current != NONE_SELECTED && !popup->is_item_disabled(current)) {
|
if (current != NONE_SELECTED && !popup->is_item_disabled(current)) {
|
||||||
if (!_was_pressed_by_mouse()) {
|
if (!_was_pressed_by_mouse()) {
|
||||||
|
|
@ -495,7 +489,10 @@ void OptionButton::show_popup() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
popup->popup();
|
Rect2 rect = get_screen_rect();
|
||||||
|
rect.position.y += rect.size.height;
|
||||||
|
rect.size.height = 0;
|
||||||
|
popup->popup(rect);
|
||||||
}
|
}
|
||||||
|
|
||||||
void OptionButton::_validate_property(PropertyInfo &p_property) const {
|
void OptionButton::_validate_property(PropertyInfo &p_property) const {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue