mirror of
https://github.com/godotengine/godot.git
synced 2025-12-08 06:09:55 +00:00
Rename the type parameter to node_type in Theme and Control
This makes it clearer that it expects a node type as a string (such as "Label") instead of a type like "TYPE_ARRAY". This is backwards-compatible since only the name of the parameter is changed, not its order. See https://github.com/godotengine/godot-proposals/issues/1495#issuecomment-691507839
This commit is contained in:
Hugo Locurcio
parent
cd62be1845
commit
e36587751f
6 changed files with 319 additions and 319 deletions
|
|
@ -37,12 +37,12 @@ void Theme::_emit_theme_changed() {
|
|||
emit_changed();
|
||||
}
|
||||
|
||||
PoolVector<String> Theme::_get_icon_list(const String &p_type) const {
|
||||
PoolVector<String> Theme::_get_icon_list(const String &p_node_type) const {
|
||||
|
||||
PoolVector<String> ilret;
|
||||
List<StringName> il;
|
||||
|
||||
get_icon_list(p_type, &il);
|
||||
get_icon_list(p_node_type, &il);
|
||||
ilret.resize(il.size());
|
||||
|
||||
int i = 0;
|
||||
|
|
@ -53,12 +53,12 @@ PoolVector<String> Theme::_get_icon_list(const String &p_type) const {
|
|||
return ilret;
|
||||
}
|
||||
|
||||
PoolVector<String> Theme::_get_stylebox_list(const String &p_type) const {
|
||||
PoolVector<String> Theme::_get_stylebox_list(const String &p_node_type) const {
|
||||
|
||||
PoolVector<String> ilret;
|
||||
List<StringName> il;
|
||||
|
||||
get_stylebox_list(p_type, &il);
|
||||
get_stylebox_list(p_node_type, &il);
|
||||
ilret.resize(il.size());
|
||||
|
||||
int i = 0;
|
||||
|
|
@ -85,12 +85,12 @@ PoolVector<String> Theme::_get_stylebox_types(void) const {
|
|||
return ilret;
|
||||
}
|
||||
|
||||
PoolVector<String> Theme::_get_font_list(const String &p_type) const {
|
||||
PoolVector<String> Theme::_get_font_list(const String &p_node_type) const {
|
||||
|
||||
PoolVector<String> ilret;
|
||||
List<StringName> il;
|
||||
|
||||
get_font_list(p_type, &il);
|
||||
get_font_list(p_node_type, &il);
|
||||
ilret.resize(il.size());
|
||||
|
||||
int i = 0;
|
||||
|
|
@ -101,12 +101,12 @@ PoolVector<String> Theme::_get_font_list(const String &p_type) const {
|
|||
return ilret;
|
||||
}
|
||||
|
||||
PoolVector<String> Theme::_get_color_list(const String &p_type) const {
|
||||
PoolVector<String> Theme::_get_color_list(const String &p_node_type) const {
|
||||
|
||||
PoolVector<String> ilret;
|
||||
List<StringName> il;
|
||||
|
||||
get_color_list(p_type, &il);
|
||||
get_color_list(p_node_type, &il);
|
||||
ilret.resize(il.size());
|
||||
|
||||
int i = 0;
|
||||
|
|
@ -117,12 +117,12 @@ PoolVector<String> Theme::_get_color_list(const String &p_type) const {
|
|||
return ilret;
|
||||
}
|
||||
|
||||
PoolVector<String> Theme::_get_constant_list(const String &p_type) const {
|
||||
PoolVector<String> Theme::_get_constant_list(const String &p_node_type) const {
|
||||
|
||||
PoolVector<String> ilret;
|
||||
List<StringName> il;
|
||||
|
||||
get_constant_list(p_type, &il);
|
||||
get_constant_list(p_node_type, &il);
|
||||
ilret.resize(il.size());
|
||||
|
||||
int i = 0;
|
||||
|
|
@ -133,7 +133,7 @@ PoolVector<String> Theme::_get_constant_list(const String &p_type) const {
|
|||
return ilret;
|
||||
}
|
||||
|
||||
PoolVector<String> Theme::_get_type_list(const String &p_type) const {
|
||||
PoolVector<String> Theme::_get_type_list(const String &p_node_type) const {
|
||||
|
||||
PoolVector<String> ilret;
|
||||
List<StringName> il;
|
||||
|
|
@ -359,20 +359,20 @@ void Theme::set_default_font(const Ref<Font> &p_font) {
|
|||
default_font = p_font;
|
||||
}
|
||||
|
||||
void Theme::set_icon(const StringName &p_name, const StringName &p_type, const Ref<Texture> &p_icon) {
|
||||
void Theme::set_icon(const StringName &p_name, const StringName &p_node_type, const Ref<Texture> &p_icon) {
|
||||
|
||||
//ERR_FAIL_COND(p_icon.is_null());
|
||||
|
||||
bool new_value = !icon_map.has(p_type) || !icon_map[p_type].has(p_name);
|
||||
bool new_value = !icon_map.has(p_node_type) || !icon_map[p_node_type].has(p_name);
|
||||
|
||||
if (icon_map[p_type].has(p_name) && icon_map[p_type][p_name].is_valid()) {
|
||||
icon_map[p_type][p_name]->disconnect("changed", this, "_emit_theme_changed");
|
||||
if (icon_map[p_node_type].has(p_name) && icon_map[p_node_type][p_name].is_valid()) {
|
||||
icon_map[p_node_type][p_name]->disconnect("changed", this, "_emit_theme_changed");
|
||||
}
|
||||
|
||||
icon_map[p_type][p_name] = p_icon;
|
||||
icon_map[p_node_type][p_name] = p_icon;
|
||||
|
||||
if (p_icon.is_valid()) {
|
||||
icon_map[p_type][p_name]->connect("changed", this, "_emit_theme_changed", varray(), CONNECT_REFERENCE_COUNTED);
|
||||
icon_map[p_node_type][p_name]->connect("changed", this, "_emit_theme_changed", varray(), CONNECT_REFERENCE_COUNTED);
|
||||
}
|
||||
|
||||
if (new_value) {
|
||||
|
|
@ -380,55 +380,55 @@ void Theme::set_icon(const StringName &p_name, const StringName &p_type, const R
|
|||
emit_changed();
|
||||
}
|
||||
}
|
||||
Ref<Texture> Theme::get_icon(const StringName &p_name, const StringName &p_type) const {
|
||||
Ref<Texture> Theme::get_icon(const StringName &p_name, const StringName &p_node_type) const {
|
||||
|
||||
if (icon_map.has(p_type) && icon_map[p_type].has(p_name) && icon_map[p_type][p_name].is_valid()) {
|
||||
if (icon_map.has(p_node_type) && icon_map[p_node_type].has(p_name) && icon_map[p_node_type][p_name].is_valid()) {
|
||||
|
||||
return icon_map[p_type][p_name];
|
||||
return icon_map[p_node_type][p_name];
|
||||
} else {
|
||||
return default_icon;
|
||||
}
|
||||
}
|
||||
|
||||
bool Theme::has_icon(const StringName &p_name, const StringName &p_type) const {
|
||||
bool Theme::has_icon(const StringName &p_name, const StringName &p_node_type) const {
|
||||
|
||||
return (icon_map.has(p_type) && icon_map[p_type].has(p_name) && icon_map[p_type][p_name].is_valid());
|
||||
return (icon_map.has(p_node_type) && icon_map[p_node_type].has(p_name) && icon_map[p_node_type][p_name].is_valid());
|
||||
}
|
||||
|
||||
void Theme::clear_icon(const StringName &p_name, const StringName &p_type) {
|
||||
void Theme::clear_icon(const StringName &p_name, const StringName &p_node_type) {
|
||||
|
||||
ERR_FAIL_COND(!icon_map.has(p_type));
|
||||
ERR_FAIL_COND(!icon_map[p_type].has(p_name));
|
||||
ERR_FAIL_COND(!icon_map.has(p_node_type));
|
||||
ERR_FAIL_COND(!icon_map[p_node_type].has(p_name));
|
||||
|
||||
if (icon_map[p_type][p_name].is_valid()) {
|
||||
icon_map[p_type][p_name]->disconnect("changed", this, "_emit_theme_changed");
|
||||
if (icon_map[p_node_type][p_name].is_valid()) {
|
||||
icon_map[p_node_type][p_name]->disconnect("changed", this, "_emit_theme_changed");
|
||||
}
|
||||
|
||||
icon_map[p_type].erase(p_name);
|
||||
icon_map[p_node_type].erase(p_name);
|
||||
|
||||
_change_notify();
|
||||
emit_changed();
|
||||
}
|
||||
|
||||
void Theme::get_icon_list(StringName p_type, List<StringName> *p_list) const {
|
||||
void Theme::get_icon_list(StringName p_node_type, List<StringName> *p_list) const {
|
||||
|
||||
ERR_FAIL_NULL(p_list);
|
||||
|
||||
if (!icon_map.has(p_type))
|
||||
if (!icon_map.has(p_node_type))
|
||||
return;
|
||||
|
||||
const StringName *key = NULL;
|
||||
|
||||
while ((key = icon_map[p_type].next(key))) {
|
||||
while ((key = icon_map[p_node_type].next(key))) {
|
||||
|
||||
p_list->push_back(*key);
|
||||
}
|
||||
}
|
||||
|
||||
void Theme::set_shader(const StringName &p_name, const StringName &p_type, const Ref<Shader> &p_shader) {
|
||||
bool new_value = !shader_map.has(p_type) || !shader_map[p_type].has(p_name);
|
||||
void Theme::set_shader(const StringName &p_name, const StringName &p_node_type, const Ref<Shader> &p_shader) {
|
||||
bool new_value = !shader_map.has(p_node_type) || !shader_map[p_node_type].has(p_name);
|
||||
|
||||
shader_map[p_type][p_name] = p_shader;
|
||||
shader_map[p_node_type][p_name] = p_shader;
|
||||
|
||||
if (new_value) {
|
||||
_change_notify();
|
||||
|
|
@ -436,56 +436,56 @@ void Theme::set_shader(const StringName &p_name, const StringName &p_type, const
|
|||
}
|
||||
}
|
||||
|
||||
Ref<Shader> Theme::get_shader(const StringName &p_name, const StringName &p_type) const {
|
||||
if (shader_map.has(p_type) && shader_map[p_type].has(p_name) && shader_map[p_type][p_name].is_valid()) {
|
||||
return shader_map[p_type][p_name];
|
||||
Ref<Shader> Theme::get_shader(const StringName &p_name, const StringName &p_node_type) const {
|
||||
if (shader_map.has(p_node_type) && shader_map[p_node_type].has(p_name) && shader_map[p_node_type][p_name].is_valid()) {
|
||||
return shader_map[p_node_type][p_name];
|
||||
} else {
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
bool Theme::has_shader(const StringName &p_name, const StringName &p_type) const {
|
||||
return (shader_map.has(p_type) && shader_map[p_type].has(p_name) && shader_map[p_type][p_name].is_valid());
|
||||
bool Theme::has_shader(const StringName &p_name, const StringName &p_node_type) const {
|
||||
return (shader_map.has(p_node_type) && shader_map[p_node_type].has(p_name) && shader_map[p_node_type][p_name].is_valid());
|
||||
}
|
||||
|
||||
void Theme::clear_shader(const StringName &p_name, const StringName &p_type) {
|
||||
ERR_FAIL_COND(!shader_map.has(p_type));
|
||||
ERR_FAIL_COND(!shader_map[p_type].has(p_name));
|
||||
void Theme::clear_shader(const StringName &p_name, const StringName &p_node_type) {
|
||||
ERR_FAIL_COND(!shader_map.has(p_node_type));
|
||||
ERR_FAIL_COND(!shader_map[p_node_type].has(p_name));
|
||||
|
||||
shader_map[p_type].erase(p_name);
|
||||
shader_map[p_node_type].erase(p_name);
|
||||
_change_notify();
|
||||
emit_changed();
|
||||
}
|
||||
|
||||
void Theme::get_shader_list(const StringName &p_type, List<StringName> *p_list) const {
|
||||
void Theme::get_shader_list(const StringName &p_node_type, List<StringName> *p_list) const {
|
||||
|
||||
ERR_FAIL_NULL(p_list);
|
||||
|
||||
if (!shader_map.has(p_type))
|
||||
if (!shader_map.has(p_node_type))
|
||||
return;
|
||||
|
||||
const StringName *key = NULL;
|
||||
|
||||
while ((key = shader_map[p_type].next(key))) {
|
||||
while ((key = shader_map[p_node_type].next(key))) {
|
||||
|
||||
p_list->push_back(*key);
|
||||
}
|
||||
}
|
||||
|
||||
void Theme::set_stylebox(const StringName &p_name, const StringName &p_type, const Ref<StyleBox> &p_style) {
|
||||
void Theme::set_stylebox(const StringName &p_name, const StringName &p_node_type, const Ref<StyleBox> &p_style) {
|
||||
|
||||
//ERR_FAIL_COND(p_style.is_null());
|
||||
|
||||
bool new_value = !style_map.has(p_type) || !style_map[p_type].has(p_name);
|
||||
bool new_value = !style_map.has(p_node_type) || !style_map[p_node_type].has(p_name);
|
||||
|
||||
if (style_map[p_type].has(p_name) && style_map[p_type][p_name].is_valid()) {
|
||||
style_map[p_type][p_name]->disconnect("changed", this, "_emit_theme_changed");
|
||||
if (style_map[p_node_type].has(p_name) && style_map[p_node_type][p_name].is_valid()) {
|
||||
style_map[p_node_type][p_name]->disconnect("changed", this, "_emit_theme_changed");
|
||||
}
|
||||
|
||||
style_map[p_type][p_name] = p_style;
|
||||
style_map[p_node_type][p_name] = p_style;
|
||||
|
||||
if (p_style.is_valid()) {
|
||||
style_map[p_type][p_name]->connect("changed", this, "_emit_theme_changed", varray(), CONNECT_REFERENCE_COUNTED);
|
||||
style_map[p_node_type][p_name]->connect("changed", this, "_emit_theme_changed", varray(), CONNECT_REFERENCE_COUNTED);
|
||||
}
|
||||
|
||||
if (new_value)
|
||||
|
|
@ -493,46 +493,46 @@ void Theme::set_stylebox(const StringName &p_name, const StringName &p_type, con
|
|||
emit_changed();
|
||||
}
|
||||
|
||||
Ref<StyleBox> Theme::get_stylebox(const StringName &p_name, const StringName &p_type) const {
|
||||
Ref<StyleBox> Theme::get_stylebox(const StringName &p_name, const StringName &p_node_type) const {
|
||||
|
||||
if (style_map.has(p_type) && style_map[p_type].has(p_name) && style_map[p_type][p_name].is_valid()) {
|
||||
if (style_map.has(p_node_type) && style_map[p_node_type].has(p_name) && style_map[p_node_type][p_name].is_valid()) {
|
||||
|
||||
return style_map[p_type][p_name];
|
||||
return style_map[p_node_type][p_name];
|
||||
} else {
|
||||
return default_style;
|
||||
}
|
||||
}
|
||||
|
||||
bool Theme::has_stylebox(const StringName &p_name, const StringName &p_type) const {
|
||||
bool Theme::has_stylebox(const StringName &p_name, const StringName &p_node_type) const {
|
||||
|
||||
return (style_map.has(p_type) && style_map[p_type].has(p_name) && style_map[p_type][p_name].is_valid());
|
||||
return (style_map.has(p_node_type) && style_map[p_node_type].has(p_name) && style_map[p_node_type][p_name].is_valid());
|
||||
}
|
||||
|
||||
void Theme::clear_stylebox(const StringName &p_name, const StringName &p_type) {
|
||||
void Theme::clear_stylebox(const StringName &p_name, const StringName &p_node_type) {
|
||||
|
||||
ERR_FAIL_COND(!style_map.has(p_type));
|
||||
ERR_FAIL_COND(!style_map[p_type].has(p_name));
|
||||
ERR_FAIL_COND(!style_map.has(p_node_type));
|
||||
ERR_FAIL_COND(!style_map[p_node_type].has(p_name));
|
||||
|
||||
if (style_map[p_type][p_name].is_valid()) {
|
||||
style_map[p_type][p_name]->disconnect("changed", this, "_emit_theme_changed");
|
||||
if (style_map[p_node_type][p_name].is_valid()) {
|
||||
style_map[p_node_type][p_name]->disconnect("changed", this, "_emit_theme_changed");
|
||||
}
|
||||
|
||||
style_map[p_type].erase(p_name);
|
||||
style_map[p_node_type].erase(p_name);
|
||||
|
||||
_change_notify();
|
||||
emit_changed();
|
||||
}
|
||||
|
||||
void Theme::get_stylebox_list(StringName p_type, List<StringName> *p_list) const {
|
||||
void Theme::get_stylebox_list(StringName p_node_type, List<StringName> *p_list) const {
|
||||
|
||||
ERR_FAIL_NULL(p_list);
|
||||
|
||||
if (!style_map.has(p_type))
|
||||
if (!style_map.has(p_node_type))
|
||||
return;
|
||||
|
||||
const StringName *key = NULL;
|
||||
|
||||
while ((key = style_map[p_type].next(key))) {
|
||||
while ((key = style_map[p_node_type].next(key))) {
|
||||
|
||||
p_list->push_back(*key);
|
||||
}
|
||||
|
|
@ -547,20 +547,20 @@ void Theme::get_stylebox_types(List<StringName> *p_list) const {
|
|||
}
|
||||
}
|
||||
|
||||
void Theme::set_font(const StringName &p_name, const StringName &p_type, const Ref<Font> &p_font) {
|
||||
void Theme::set_font(const StringName &p_name, const StringName &p_node_type, const Ref<Font> &p_font) {
|
||||
|
||||
//ERR_FAIL_COND(p_font.is_null());
|
||||
|
||||
bool new_value = !font_map.has(p_type) || !font_map[p_type].has(p_name);
|
||||
bool new_value = !font_map.has(p_node_type) || !font_map[p_node_type].has(p_name);
|
||||
|
||||
if (font_map[p_type][p_name].is_valid()) {
|
||||
font_map[p_type][p_name]->disconnect("changed", this, "_emit_theme_changed");
|
||||
if (font_map[p_node_type][p_name].is_valid()) {
|
||||
font_map[p_node_type][p_name]->disconnect("changed", this, "_emit_theme_changed");
|
||||
}
|
||||
|
||||
font_map[p_type][p_name] = p_font;
|
||||
font_map[p_node_type][p_name] = p_font;
|
||||
|
||||
if (p_font.is_valid()) {
|
||||
font_map[p_type][p_name]->connect("changed", this, "_emit_theme_changed", varray(), CONNECT_REFERENCE_COUNTED);
|
||||
font_map[p_node_type][p_name]->connect("changed", this, "_emit_theme_changed", varray(), CONNECT_REFERENCE_COUNTED);
|
||||
}
|
||||
|
||||
if (new_value) {
|
||||
|
|
@ -568,55 +568,55 @@ void Theme::set_font(const StringName &p_name, const StringName &p_type, const R
|
|||
emit_changed();
|
||||
}
|
||||
}
|
||||
Ref<Font> Theme::get_font(const StringName &p_name, const StringName &p_type) const {
|
||||
Ref<Font> Theme::get_font(const StringName &p_name, const StringName &p_node_type) const {
|
||||
|
||||
if (font_map.has(p_type) && font_map[p_type].has(p_name) && font_map[p_type][p_name].is_valid())
|
||||
return font_map[p_type][p_name];
|
||||
if (font_map.has(p_node_type) && font_map[p_node_type].has(p_name) && font_map[p_node_type][p_name].is_valid())
|
||||
return font_map[p_node_type][p_name];
|
||||
else if (default_theme_font.is_valid())
|
||||
return default_theme_font;
|
||||
else
|
||||
return default_font;
|
||||
}
|
||||
|
||||
bool Theme::has_font(const StringName &p_name, const StringName &p_type) const {
|
||||
bool Theme::has_font(const StringName &p_name, const StringName &p_node_type) const {
|
||||
|
||||
return (font_map.has(p_type) && font_map[p_type].has(p_name) && font_map[p_type][p_name].is_valid());
|
||||
return (font_map.has(p_node_type) && font_map[p_node_type].has(p_name) && font_map[p_node_type][p_name].is_valid());
|
||||
}
|
||||
|
||||
void Theme::clear_font(const StringName &p_name, const StringName &p_type) {
|
||||
void Theme::clear_font(const StringName &p_name, const StringName &p_node_type) {
|
||||
|
||||
ERR_FAIL_COND(!font_map.has(p_type));
|
||||
ERR_FAIL_COND(!font_map[p_type].has(p_name));
|
||||
ERR_FAIL_COND(!font_map.has(p_node_type));
|
||||
ERR_FAIL_COND(!font_map[p_node_type].has(p_name));
|
||||
|
||||
if (font_map[p_type][p_name].is_valid()) {
|
||||
font_map[p_type][p_name]->disconnect("changed", this, "_emit_theme_changed");
|
||||
if (font_map[p_node_type][p_name].is_valid()) {
|
||||
font_map[p_node_type][p_name]->disconnect("changed", this, "_emit_theme_changed");
|
||||
}
|
||||
|
||||
font_map[p_type].erase(p_name);
|
||||
font_map[p_node_type].erase(p_name);
|
||||
_change_notify();
|
||||
emit_changed();
|
||||
}
|
||||
|
||||
void Theme::get_font_list(StringName p_type, List<StringName> *p_list) const {
|
||||
void Theme::get_font_list(StringName p_node_type, List<StringName> *p_list) const {
|
||||
|
||||
ERR_FAIL_NULL(p_list);
|
||||
|
||||
if (!font_map.has(p_type))
|
||||
if (!font_map.has(p_node_type))
|
||||
return;
|
||||
|
||||
const StringName *key = NULL;
|
||||
|
||||
while ((key = font_map[p_type].next(key))) {
|
||||
while ((key = font_map[p_node_type].next(key))) {
|
||||
|
||||
p_list->push_back(*key);
|
||||
}
|
||||
}
|
||||
|
||||
void Theme::set_color(const StringName &p_name, const StringName &p_type, const Color &p_color) {
|
||||
void Theme::set_color(const StringName &p_name, const StringName &p_node_type, const Color &p_color) {
|
||||
|
||||
bool new_value = !color_map.has(p_type) || !color_map[p_type].has(p_name);
|
||||
bool new_value = !color_map.has(p_node_type) || !color_map[p_node_type].has(p_name);
|
||||
|
||||
color_map[p_type][p_name] = p_color;
|
||||
color_map[p_node_type][p_name] = p_color;
|
||||
|
||||
if (new_value) {
|
||||
_change_notify();
|
||||
|
|
@ -624,48 +624,48 @@ void Theme::set_color(const StringName &p_name, const StringName &p_type, const
|
|||
}
|
||||
}
|
||||
|
||||
Color Theme::get_color(const StringName &p_name, const StringName &p_type) const {
|
||||
Color Theme::get_color(const StringName &p_name, const StringName &p_node_type) const {
|
||||
|
||||
if (color_map.has(p_type) && color_map[p_type].has(p_name))
|
||||
return color_map[p_type][p_name];
|
||||
if (color_map.has(p_node_type) && color_map[p_node_type].has(p_name))
|
||||
return color_map[p_node_type][p_name];
|
||||
else
|
||||
return Color();
|
||||
}
|
||||
|
||||
bool Theme::has_color(const StringName &p_name, const StringName &p_type) const {
|
||||
bool Theme::has_color(const StringName &p_name, const StringName &p_node_type) const {
|
||||
|
||||
return (color_map.has(p_type) && color_map[p_type].has(p_name));
|
||||
return (color_map.has(p_node_type) && color_map[p_node_type].has(p_name));
|
||||
}
|
||||
|
||||
void Theme::clear_color(const StringName &p_name, const StringName &p_type) {
|
||||
void Theme::clear_color(const StringName &p_name, const StringName &p_node_type) {
|
||||
|
||||
ERR_FAIL_COND(!color_map.has(p_type));
|
||||
ERR_FAIL_COND(!color_map[p_type].has(p_name));
|
||||
ERR_FAIL_COND(!color_map.has(p_node_type));
|
||||
ERR_FAIL_COND(!color_map[p_node_type].has(p_name));
|
||||
|
||||
color_map[p_type].erase(p_name);
|
||||
color_map[p_node_type].erase(p_name);
|
||||
_change_notify();
|
||||
emit_changed();
|
||||
}
|
||||
|
||||
void Theme::get_color_list(StringName p_type, List<StringName> *p_list) const {
|
||||
void Theme::get_color_list(StringName p_node_type, List<StringName> *p_list) const {
|
||||
|
||||
ERR_FAIL_NULL(p_list);
|
||||
|
||||
if (!color_map.has(p_type))
|
||||
if (!color_map.has(p_node_type))
|
||||
return;
|
||||
|
||||
const StringName *key = NULL;
|
||||
|
||||
while ((key = color_map[p_type].next(key))) {
|
||||
while ((key = color_map[p_node_type].next(key))) {
|
||||
|
||||
p_list->push_back(*key);
|
||||
}
|
||||
}
|
||||
|
||||
void Theme::set_constant(const StringName &p_name, const StringName &p_type, int p_constant) {
|
||||
void Theme::set_constant(const StringName &p_name, const StringName &p_node_type, int p_constant) {
|
||||
|
||||
bool new_value = !constant_map.has(p_type) || !constant_map[p_type].has(p_name);
|
||||
constant_map[p_type][p_name] = p_constant;
|
||||
bool new_value = !constant_map.has(p_node_type) || !constant_map[p_node_type].has(p_name);
|
||||
constant_map[p_node_type][p_name] = p_constant;
|
||||
|
||||
if (new_value) {
|
||||
_change_notify();
|
||||
|
|
@ -673,40 +673,40 @@ void Theme::set_constant(const StringName &p_name, const StringName &p_type, int
|
|||
}
|
||||
}
|
||||
|
||||
int Theme::get_constant(const StringName &p_name, const StringName &p_type) const {
|
||||
int Theme::get_constant(const StringName &p_name, const StringName &p_node_type) const {
|
||||
|
||||
if (constant_map.has(p_type) && constant_map[p_type].has(p_name))
|
||||
return constant_map[p_type][p_name];
|
||||
if (constant_map.has(p_node_type) && constant_map[p_node_type].has(p_name))
|
||||
return constant_map[p_node_type][p_name];
|
||||
else {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
bool Theme::has_constant(const StringName &p_name, const StringName &p_type) const {
|
||||
bool Theme::has_constant(const StringName &p_name, const StringName &p_node_type) const {
|
||||
|
||||
return (constant_map.has(p_type) && constant_map[p_type].has(p_name));
|
||||
return (constant_map.has(p_node_type) && constant_map[p_node_type].has(p_name));
|
||||
}
|
||||
|
||||
void Theme::clear_constant(const StringName &p_name, const StringName &p_type) {
|
||||
void Theme::clear_constant(const StringName &p_name, const StringName &p_node_type) {
|
||||
|
||||
ERR_FAIL_COND(!constant_map.has(p_type));
|
||||
ERR_FAIL_COND(!constant_map[p_type].has(p_name));
|
||||
ERR_FAIL_COND(!constant_map.has(p_node_type));
|
||||
ERR_FAIL_COND(!constant_map[p_node_type].has(p_name));
|
||||
|
||||
constant_map[p_type].erase(p_name);
|
||||
constant_map[p_node_type].erase(p_name);
|
||||
_change_notify();
|
||||
emit_changed();
|
||||
}
|
||||
|
||||
void Theme::get_constant_list(StringName p_type, List<StringName> *p_list) const {
|
||||
void Theme::get_constant_list(StringName p_node_type, List<StringName> *p_list) const {
|
||||
|
||||
ERR_FAIL_NULL(p_list);
|
||||
|
||||
if (!constant_map.has(p_type))
|
||||
if (!constant_map.has(p_node_type))
|
||||
return;
|
||||
|
||||
const StringName *key = NULL;
|
||||
|
||||
while ((key = constant_map[p_type].next(key))) {
|
||||
while ((key = constant_map[p_node_type].next(key))) {
|
||||
|
||||
p_list->push_back(*key);
|
||||
}
|
||||
|
|
@ -868,43 +868,43 @@ void Theme::get_type_list(List<StringName> *p_list) const {
|
|||
|
||||
void Theme::_bind_methods() {
|
||||
|
||||
ClassDB::bind_method(D_METHOD("set_icon", "name", "type", "texture"), &Theme::set_icon);
|
||||
ClassDB::bind_method(D_METHOD("get_icon", "name", "type"), &Theme::get_icon);
|
||||
ClassDB::bind_method(D_METHOD("has_icon", "name", "type"), &Theme::has_icon);
|
||||
ClassDB::bind_method(D_METHOD("clear_icon", "name", "type"), &Theme::clear_icon);
|
||||
ClassDB::bind_method(D_METHOD("get_icon_list", "type"), &Theme::_get_icon_list);
|
||||
ClassDB::bind_method(D_METHOD("set_icon", "name", "node_type", "texture"), &Theme::set_icon);
|
||||
ClassDB::bind_method(D_METHOD("get_icon", "name", "node_type"), &Theme::get_icon);
|
||||
ClassDB::bind_method(D_METHOD("has_icon", "name", "node_type"), &Theme::has_icon);
|
||||
ClassDB::bind_method(D_METHOD("clear_icon", "name", "node_type"), &Theme::clear_icon);
|
||||
ClassDB::bind_method(D_METHOD("get_icon_list", "node_type"), &Theme::_get_icon_list);
|
||||
|
||||
ClassDB::bind_method(D_METHOD("set_stylebox", "name", "type", "texture"), &Theme::set_stylebox);
|
||||
ClassDB::bind_method(D_METHOD("get_stylebox", "name", "type"), &Theme::get_stylebox);
|
||||
ClassDB::bind_method(D_METHOD("has_stylebox", "name", "type"), &Theme::has_stylebox);
|
||||
ClassDB::bind_method(D_METHOD("clear_stylebox", "name", "type"), &Theme::clear_stylebox);
|
||||
ClassDB::bind_method(D_METHOD("get_stylebox_list", "type"), &Theme::_get_stylebox_list);
|
||||
ClassDB::bind_method(D_METHOD("set_stylebox", "name", "node_type", "texture"), &Theme::set_stylebox);
|
||||
ClassDB::bind_method(D_METHOD("get_stylebox", "name", "node_type"), &Theme::get_stylebox);
|
||||
ClassDB::bind_method(D_METHOD("has_stylebox", "name", "node_type"), &Theme::has_stylebox);
|
||||
ClassDB::bind_method(D_METHOD("clear_stylebox", "name", "node_type"), &Theme::clear_stylebox);
|
||||
ClassDB::bind_method(D_METHOD("get_stylebox_list", "node_type"), &Theme::_get_stylebox_list);
|
||||
ClassDB::bind_method(D_METHOD("get_stylebox_types"), &Theme::_get_stylebox_types);
|
||||
|
||||
ClassDB::bind_method(D_METHOD("set_font", "name", "type", "font"), &Theme::set_font);
|
||||
ClassDB::bind_method(D_METHOD("get_font", "name", "type"), &Theme::get_font);
|
||||
ClassDB::bind_method(D_METHOD("has_font", "name", "type"), &Theme::has_font);
|
||||
ClassDB::bind_method(D_METHOD("clear_font", "name", "type"), &Theme::clear_font);
|
||||
ClassDB::bind_method(D_METHOD("get_font_list", "type"), &Theme::_get_font_list);
|
||||
ClassDB::bind_method(D_METHOD("set_font", "name", "node_type", "font"), &Theme::set_font);
|
||||
ClassDB::bind_method(D_METHOD("get_font", "name", "node_type"), &Theme::get_font);
|
||||
ClassDB::bind_method(D_METHOD("has_font", "name", "node_type"), &Theme::has_font);
|
||||
ClassDB::bind_method(D_METHOD("clear_font", "name", "node_type"), &Theme::clear_font);
|
||||
ClassDB::bind_method(D_METHOD("get_font_list", "node_type"), &Theme::_get_font_list);
|
||||
|
||||
ClassDB::bind_method(D_METHOD("set_color", "name", "type", "color"), &Theme::set_color);
|
||||
ClassDB::bind_method(D_METHOD("get_color", "name", "type"), &Theme::get_color);
|
||||
ClassDB::bind_method(D_METHOD("has_color", "name", "type"), &Theme::has_color);
|
||||
ClassDB::bind_method(D_METHOD("clear_color", "name", "type"), &Theme::clear_color);
|
||||
ClassDB::bind_method(D_METHOD("get_color_list", "type"), &Theme::_get_color_list);
|
||||
ClassDB::bind_method(D_METHOD("set_color", "name", "node_type", "color"), &Theme::set_color);
|
||||
ClassDB::bind_method(D_METHOD("get_color", "name", "node_type"), &Theme::get_color);
|
||||
ClassDB::bind_method(D_METHOD("has_color", "name", "node_type"), &Theme::has_color);
|
||||
ClassDB::bind_method(D_METHOD("clear_color", "name", "node_type"), &Theme::clear_color);
|
||||
ClassDB::bind_method(D_METHOD("get_color_list", "node_type"), &Theme::_get_color_list);
|
||||
|
||||
ClassDB::bind_method(D_METHOD("set_constant", "name", "type", "constant"), &Theme::set_constant);
|
||||
ClassDB::bind_method(D_METHOD("get_constant", "name", "type"), &Theme::get_constant);
|
||||
ClassDB::bind_method(D_METHOD("has_constant", "name", "type"), &Theme::has_constant);
|
||||
ClassDB::bind_method(D_METHOD("clear_constant", "name", "type"), &Theme::clear_constant);
|
||||
ClassDB::bind_method(D_METHOD("get_constant_list", "type"), &Theme::_get_constant_list);
|
||||
ClassDB::bind_method(D_METHOD("set_constant", "name", "node_type", "constant"), &Theme::set_constant);
|
||||
ClassDB::bind_method(D_METHOD("get_constant", "name", "node_type"), &Theme::get_constant);
|
||||
ClassDB::bind_method(D_METHOD("has_constant", "name", "node_type"), &Theme::has_constant);
|
||||
ClassDB::bind_method(D_METHOD("clear_constant", "name", "node_type"), &Theme::clear_constant);
|
||||
ClassDB::bind_method(D_METHOD("get_constant_list", "node_type"), &Theme::_get_constant_list);
|
||||
|
||||
ClassDB::bind_method(D_METHOD("clear"), &Theme::clear);
|
||||
|
||||
ClassDB::bind_method(D_METHOD("set_default_font", "font"), &Theme::set_default_theme_font);
|
||||
ClassDB::bind_method(D_METHOD("get_default_font"), &Theme::get_default_theme_font);
|
||||
|
||||
ClassDB::bind_method(D_METHOD("get_type_list", "type"), &Theme::_get_type_list);
|
||||
ClassDB::bind_method(D_METHOD("get_type_list", "node_type"), &Theme::_get_type_list);
|
||||
|
||||
ClassDB::bind_method(D_METHOD("_emit_theme_changed"), &Theme::_emit_theme_changed);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue