Merge pull request #35612 from timothyqiu/option-button-arrow

Fixes OptionButton minimum size
This commit is contained in:
Rémi Verschelde 2020-01-31 11:25:13 +01:00 committed by GitHub
commit 5da20d6cf2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions

View File

@ -36,7 +36,14 @@ Size2 OptionButton::get_minimum_size() const {
Size2 minsize = Button::get_minimum_size();
if (has_icon("arrow")) {
minsize.width += Control::get_icon("arrow")->get_width() + get_constant("hseparation");
const Size2 padding = get_stylebox("normal")->get_minimum_size();
const Size2 arrow_size = Control::get_icon("arrow")->get_size();
Size2 content_size = minsize - padding;
content_size.width += arrow_size.width + get_constant("hseparation");
content_size.height = MAX(content_size.height, arrow_size.height);
minsize = content_size + padding;
}
return minsize;