maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Translate ButtonArray text

Browse source
This commit is contained in:
volzhs 2017-02-08 08:38:36 +09:00
parent 903a3aa5f0
commit 57ed6ef741
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
scene/gui/button_array.cpp
View file

@ -58,9 +58,10 @@ bool ButtonArray::_set(const StringName& p_name, const Variant& p_value) {
int idx=what.to_int(); int idx=what.to_int();
ERR_FAIL_INDEX_V(idx,buttons.size(),false); ERR_FAIL_INDEX_V(idx,buttons.size(),false);
String f = n.get_slicec('/',2); String f = n.get_slicec('/',2);
if (f=="text") if (f=="text") {
buttons[idx].text=p_value; buttons[idx].text=p_value;
else if (f=="tooltip") buttons[idx].xl_text=XL_MESSAGE(p_value);
} else if (f=="tooltip")
buttons[idx].tooltip=p_value; buttons[idx].tooltip=p_value;
else if (f=="icon") else if (f=="icon")
buttons[idx].icon=p_value; buttons[idx].icon=p_value;
@ -146,7 +147,7 @@ Size2 ButtonArray::get_minimum_size() const {
Ref<Font> f = i==selected ? font_selected : font_normal; Ref<Font> f = i==selected ? font_selected : font_normal;
Size2 ms; Size2 ms;
ms = f->get_string_size(buttons[i].text); ms = f->get_string_size(buttons[i].xl_text);
if (buttons[i].icon.is_valid()) { if (buttons[i].icon.is_valid()) {
Size2 bs = buttons[i].icon->get_size(); Size2 bs = buttons[i].icon->get_size();
@ -275,7 +276,7 @@ void ButtonArray::_notification(int p_what) {
c=color_normal; c=color_normal;
} }
Size2 ssize = f->get_string_size(buttons[i].text); Size2 ssize = f->get_string_size(buttons[i].xl_text);
if (buttons[i].icon.is_valid()) { if (buttons[i].icon.is_valid()) {
ssize.x+=buttons[i].icon->get_width(); ssize.x+=buttons[i].icon->get_width();
@ -287,7 +288,7 @@ void ButtonArray::_notification(int p_what) {
text_ofs.x+=buttons[i].icon->get_width()+icon_sep; text_ofs.x+=buttons[i].icon->get_width()+icon_sep;
} }
draw_string(f,text_ofs+r.pos,buttons[i].text,c); draw_string(f,text_ofs+r.pos,buttons[i].xl_text,c);
buttons[i]._pos_cache=ofs; buttons[i]._pos_cache=ofs;
buttons[i]._size_cache=s; buttons[i]._size_cache=s;
@ -404,6 +405,7 @@ void ButtonArray::add_button(const String& p_text,const String& p_tooltip) {
Button button; Button button;
button.text=p_text; button.text=p_text;
button.xl_text=XL_MESSAGE(p_text);
button.tooltip=p_tooltip; button.tooltip=p_tooltip;
buttons.push_back(button); buttons.push_back(button);
update(); update();
@ -418,6 +420,7 @@ void ButtonArray::add_icon_button(const Ref<Texture>& p_icon,const String& p_tex
Button button; Button button;
button.text=p_text; button.text=p_text;
button.xl_text=XL_MESSAGE(p_text);
button.icon=p_icon; button.icon=p_icon;
button.tooltip=p_tooltip; button.tooltip=p_tooltip;
buttons.push_back(button); buttons.push_back(button);
@ -432,6 +435,7 @@ void ButtonArray::set_button_text(int p_button, const String& p_text) {
ERR_FAIL_INDEX(p_button,buttons.size()); ERR_FAIL_INDEX(p_button,buttons.size());
buttons[p_button].text=p_text; buttons[p_button].text=p_text;
buttons[p_button].xl_text=XL_MESSAGE(p_text);
update(); update();
minimum_size_changed(); minimum_size_changed();

1
scene/gui/button_array.h
View file

@ -50,6 +50,7 @@ private:
struct Button { struct Button {
String text; String text;
String xl_text;
String tooltip; String tooltip;
Ref<Texture> icon; Ref<Texture> icon;
mutable int _ms_cache; mutable int _ms_cache;