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

Merge pull request #33465 from rxlecky/list-theme-resources-fix

Browse source 
Fix functions listing all theme resources
This commit is contained in:
Rémi Verschelde 2019-11-09 18:23:49 +01:00 committed by GitHub
commit 0bfd06a911
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
scene/resources/theme.cpp
View file

@ -44,8 +44,11 @@ PoolVector<String> Theme::_get_icon_list(const String &p_type) const {
get_icon_list(p_type, &il);
ilret.resize(il.size());
for (List<StringName>::Element *E = il.front(); E; E = E->next()) {
ilret.push_back(E->get());
int i = 0;
PoolVector<String>::Write w = ilret.write();
for (List<StringName>::Element *E = il.front(); E; E = E->next(), i++) {
w[i] = E->get();
}
return ilret;
}
@ -57,8 +60,11 @@ PoolVector<String> Theme::_get_stylebox_list(const String &p_type) const {
get_stylebox_list(p_type, &il);
ilret.resize(il.size());
for (List<StringName>::Element *E = il.front(); E; E = E->next()) {
ilret.push_back(E->get());
int i = 0;
PoolVector<String>::Write w = ilret.write();
for (List<StringName>::Element *E = il.front(); E; E = E->next(), i++) {
w[i] = E->get();
}
return ilret;
}
@ -70,8 +76,11 @@ PoolVector<String> Theme::_get_stylebox_types(void) const {
get_stylebox_types(&il);
ilret.resize(il.size());
for (List<StringName>::Element *E = il.front(); E; E = E->next()) {
ilret.push_back(E->get());
int i = 0;
PoolVector<String>::Write w = ilret.write();
for (List<StringName>::Element *E = il.front(); E; E = E->next(), i++) {
w[i] = E->get();
}
return ilret;
}
@ -83,8 +92,11 @@ PoolVector<String> Theme::_get_font_list(const String &p_type) const {
get_font_list(p_type, &il);
ilret.resize(il.size());
for (List<StringName>::Element *E = il.front(); E; E = E->next()) {
ilret.push_back(E->get());
int i = 0;
PoolVector<String>::Write w = ilret.write();
for (List<StringName>::Element *E = il.front(); E; E = E->next(), i++) {
w[i] = E->get();
}
return ilret;
}
@ -96,8 +108,11 @@ PoolVector<String> Theme::_get_color_list(const String &p_type) const {
get_color_list(p_type, &il);
ilret.resize(il.size());
for (List<StringName>::Element *E = il.front(); E; E = E->next()) {
ilret.push_back(E->get());
int i = 0;
PoolVector<String>::Write w = ilret.write();
for (List<StringName>::Element *E = il.front(); E; E = E->next(), i++) {
w[i] = E->get();
}
return ilret;
}
@ -109,8 +124,11 @@ PoolVector<String> Theme::_get_constant_list(const String &p_type) const {
get_constant_list(p_type, &il);
ilret.resize(il.size());
for (List<StringName>::Element *E = il.front(); E; E = E->next()) {
ilret.push_back(E->get());
int i = 0;
PoolVector<String>::Write w = ilret.write();
for (List<StringName>::Element *E = il.front(); E; E = E->next(), i++) {
w[i] = E->get();
}
return ilret;
}
@ -122,8 +140,11 @@ PoolVector<String> Theme::_get_type_list(const String &p_type) const {
get_type_list(&il);
ilret.resize(il.size());
for (List<StringName>::Element *E = il.front(); E; E = E->next()) {
ilret.push_back(E->get());
int i = 0;
PoolVector<String>::Write w = ilret.write();
for (List<StringName>::Element *E = il.front(); E; E = E->next(), i++) {
w[i] = E->get();
}
return ilret;
}