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

Clear overrides on passing null

Browse source
This commit is contained in:
Swarnim Arun 2019-05-20 23:02:31 +05:30
parent 5cc1c7d642
commit 6ab7fb4976
1 changed files with 37 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
scene/gui/control.cpp
View file

@ -1840,53 +1840,72 @@ Rect2 Control::get_anchorable_rect() const {
void Control::add_icon_override(const StringName &p_name, const Ref<Texture> &p_icon) { void Control::add_icon_override(const StringName &p_name, const Ref<Texture> &p_icon) {
ERR_FAIL_COND(p_icon.is_null());
if (data.icon_override.has(p_name)) { if (data.icon_override.has(p_name)) {
data.icon_override[p_name]->disconnect("changed", this, "_override_changed"); data.icon_override[p_name]->disconnect("changed", this, "_override_changed");
} }
// clear if "null" is passed instead of a icon
if (p_icon.is_null()) {
data.icon_override.erase(p_name);
} else {
data.icon_override[p_name] = p_icon; data.icon_override[p_name] = p_icon;
if (data.icon_override[p_name].is_valid()) { if (data.icon_override[p_name].is_valid()) {
data.icon_override[p_name]->connect("changed", this, "_override_changed", Vector<Variant>(), CONNECT_REFERENCE_COUNTED); data.icon_override[p_name]->connect("changed", this, "_override_changed", Vector<Variant>(), CONNECT_REFERENCE_COUNTED);
} }
}
notification(NOTIFICATION_THEME_CHANGED); notification(NOTIFICATION_THEME_CHANGED);
} }
void Control::add_shader_override(const StringName &p_name, const Ref<Shader> &p_shader) { void Control::add_shader_override(const StringName &p_name, const Ref<Shader> &p_shader) {
ERR_FAIL_COND(p_shader.is_null());
if (data.shader_override.has(p_name)) { if (data.shader_override.has(p_name)) {
data.shader_override[p_name]->disconnect("changed", this, "_override_changed"); data.shader_override[p_name]->disconnect("changed", this, "_override_changed");
} }
// clear if "null" is passed instead of a shader
if (p_shader.is_null()) {
data.shader_override.erase(p_name);
} else {
data.shader_override[p_name] = p_shader; data.shader_override[p_name] = p_shader;
if (data.shader_override[p_name].is_valid()) { if (data.shader_override[p_name].is_valid()) {
data.shader_override[p_name]->connect("changed", this, "_override_changed", Vector<Variant>(), CONNECT_REFERENCE_COUNTED); data.shader_override[p_name]->connect("changed", this, "_override_changed", Vector<Variant>(), CONNECT_REFERENCE_COUNTED);
} }
}
notification(NOTIFICATION_THEME_CHANGED); notification(NOTIFICATION_THEME_CHANGED);
} }
void Control::add_style_override(const StringName &p_name, const Ref<StyleBox> &p_style) { void Control::add_style_override(const StringName &p_name, const Ref<StyleBox> &p_style) {
ERR_FAIL_COND(p_style.is_null());
if (data.style_override.has(p_name)) { if (data.style_override.has(p_name)) {
data.style_override[p_name]->disconnect("changed", this, "_override_changed"); data.style_override[p_name]->disconnect("changed", this, "_override_changed");
} }
// clear if "null" is passed instead of a style
if (p_style.is_null()) {
data.style_override.erase(p_name);
} else {
data.style_override[p_name] = p_style; data.style_override[p_name] = p_style;
if (data.style_override[p_name].is_valid()) { if (data.style_override[p_name].is_valid()) {
data.style_override[p_name]->connect("changed", this, "_override_changed", Vector<Variant>(), CONNECT_REFERENCE_COUNTED); data.style_override[p_name]->connect("changed", this, "_override_changed", Vector<Variant>(), CONNECT_REFERENCE_COUNTED);
} }
}
notification(NOTIFICATION_THEME_CHANGED); notification(NOTIFICATION_THEME_CHANGED);
} }
void Control::add_font_override(const StringName &p_name, const Ref<Font> &p_font) { void Control::add_font_override(const StringName &p_name, const Ref<Font> &p_font) {
ERR_FAIL_COND(p_font.is_null());
if (data.font_override.has(p_name)) { if (data.font_override.has(p_name)) {
data.font_override[p_name]->disconnect("changed", this, "_override_changed"); data.font_override[p_name]->disconnect("changed", this, "_override_changed");
} }
// clear if "null" is passed instead of a font
if (p_font.is_null()) {
data.font_override.erase(p_name);
} else {
data.font_override[p_name] = p_font; data.font_override[p_name] = p_font;
if (data.font_override[p_name].is_valid()) { if (data.font_override[p_name].is_valid()) {
data.font_override[p_name]->connect("changed", this, "_override_changed", Vector<Variant>(), CONNECT_REFERENCE_COUNTED); data.font_override[p_name]->connect("changed", this, "_override_changed", Vector<Variant>(), CONNECT_REFERENCE_COUNTED);
} }
}
notification(NOTIFICATION_THEME_CHANGED); notification(NOTIFICATION_THEME_CHANGED);
} }
void Control::add_color_override(const StringName &p_name, const Color &p_color) { void Control::add_color_override(const StringName &p_name, const Color &p_color) {