godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix invalid minimum size for translated messages in option button 

(cherry picked from commit c33748d954)
This commit is contained in:
Florian Kothmeier 2023-06-27 16:22:58 +02:00 committed by Yuri Sizov
parent ac87b5df75
commit 240701f95a
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scene/gui/option_button.cpp
View File

@ -451,7 +451,7 @@ void OptionButton::_refresh_size_cache() {
_cached_size = Vector2(); _cached_size = Vector2();
for (int i = 0; i < get_item_count(); i++) { for (int i = 0; i < get_item_count(); i++) {
_cached_size = _cached_size.max(get_minimum_size_for_text_and_icon(get_item_text(i), get_item_icon(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(); update_minimum_size();
} }

5
scene/gui/popup_menu.cpp
View File

@ -1471,6 +1471,11 @@ String PopupMenu::get_item_text(int p_idx) const {
return items[p_idx].text; return items[p_idx].text;
} }
String PopupMenu::get_item_xl_text(int p_idx) const {
ERR_FAIL_INDEX_V(p_idx, items.size(), "");
return items[p_idx].xl_text;
}
Control::TextDirection PopupMenu::get_item_text_direction(int p_idx) const { Control::TextDirection PopupMenu::get_item_text_direction(int p_idx) const {
ERR_FAIL_INDEX_V(p_idx, items.size(), Control::TEXT_DIRECTION_INHERITED); ERR_FAIL_INDEX_V(p_idx, items.size(), Control::TEXT_DIRECTION_INHERITED);
return items[p_idx].text_direction; return items[p_idx].text_direction;

1
scene/gui/popup_menu.h
View File

@ -250,6 +250,7 @@ public:
void toggle_item_checked(int p_idx); void toggle_item_checked(int p_idx);
String get_item_text(int p_idx) const; String get_item_text(int p_idx) const;
String get_item_xl_text(int p_idx) const;
Control::TextDirection get_item_text_direction(int p_idx) const; Control::TextDirection get_item_text_direction(int p_idx) const;
String get_item_language(int p_idx) const; String get_item_language(int p_idx) const;
int get_item_idx_from_text(const String &text) const; int get_item_idx_from_text(const String &text) const;