gaming/godot
gaming/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot synced 2024-09-16 04:47:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #78835 from Dragoncraft89/patch-1

Browse source 
Fix invalid minimum size for translated messages in option button
This commit is contained in:
Rémi Verschelde 2023-07-08 18:19:25 +02:00
parent 4a3c6629be c33748d954
commit 6ab727edc2
No known key found for this signature in database
GPG key ID: C3336907360768E1
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();
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();
}

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;
}
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 {
ERR_FAIL_INDEX_V(p_idx, items.size(), Control::TEXT_DIRECTION_INHERITED);
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);
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;
String get_item_language(int p_idx) const;
int get_item_idx_from_text(const String &text) const;