From 5e7a5cd2b19d220241cfda7695a26ac2e02d890e Mon Sep 17 00:00:00 2001 From: Haoyu Qiu Date: Sat, 15 Jul 2023 11:10:23 +0800 Subject: [PATCH] Update OptionButton min size when disabling Fit to Longest Item (cherry picked from commit 5384c1a579bfc0073c2bfee0e02d0987a160a2c3) --- scene/gui/option_button.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/scene/gui/option_button.cpp b/scene/gui/option_button.cpp index 71d64c8bffb..8138a66f640 100644 --- a/scene/gui/option_button.cpp +++ b/scene/gui/option_button.cpp @@ -445,13 +445,11 @@ void OptionButton::_select_int(int p_which) { void OptionButton::_refresh_size_cache() { cache_refresh_pending = false; - if (!fit_to_longest_item) { - return; - } - - _cached_size = Vector2(); - for (int i = 0; i < get_item_count(); i++) { - _cached_size = _cached_size.max(get_minimum_size_for_text_and_icon(popup->get_item_xl_text(i), get_item_icon(i))); + if (fit_to_longest_item) { + _cached_size = Vector2(); + for (int i = 0; i < get_item_count(); i++) { + _cached_size = _cached_size.max(get_minimum_size_for_text_and_icon(popup->get_item_xl_text(i), get_item_icon(i))); + } } update_minimum_size(); }