asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

was fetching incorrect meta data for tab titles

Browse source 
closes #650
This commit is contained in:
Dana Olson 2014-08-28 02:06:53 -04:00
parent a8266cd9b2
commit d344043db7
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scene/gui/tab_container.cpp
View file

@ -113,7 +113,7 @@ void TabContainer::_input_event(const InputEvent& p_event) {
break; break;
} }
String s = c->has_meta("_tab_title")?String(XL_MESSAGE(String(c->get_meta("_tab_title")))):String(c->get_name()); String s = c->has_meta("_tab_name")?String(XL_MESSAGE(String(c->get_meta("_tab_name")))):String(c->get_name());
int tab_width=font->get_string_size(s).width; int tab_width=font->get_string_size(s).width;
if (c->has_meta("_tab_icon")) { if (c->has_meta("_tab_icon")) {
@ -220,7 +220,7 @@ void TabContainer::_notification(int p_what) {
continue; continue;
String s = c->has_meta("_tab_title")?String(XL_MESSAGE(String(c->get_meta("_tab_title")))):String(c->get_name()); String s = c->has_meta("_tab_name")?String(XL_MESSAGE(String(c->get_meta("_tab_name")))):String(c->get_name());
w+=font->get_string_size(s).width; w+=font->get_string_size(s).width;
if (c->has_meta("_tab_icon")) { if (c->has_meta("_tab_icon")) {
Ref<Texture> icon = c->get_meta("_tab_icon"); Ref<Texture> icon = c->get_meta("_tab_icon");
@ -284,7 +284,7 @@ void TabContainer::_notification(int p_what) {
continue; continue;
} }
String s = c->has_meta("_tab_title")?String(c->get_meta("_tab_title")):String(c->get_name()); String s = c->has_meta("_tab_name")?String(c->get_meta("_tab_name")):String(c->get_name());
int w=font->get_string_size(s).width; int w=font->get_string_size(s).width;
Ref<Texture> icon; Ref<Texture> icon;
if (c->has_meta("_tab_icon")) { if (c->has_meta("_tab_icon")) {