godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-03 18:11:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

Clean up and fix issues after merging #21701 , closes #21104

Browse Source
This commit is contained in:
Juan Linietsky
2019-01-18 13:01:24 -03:00
parent 580bebda52
commit 541422a4a2
11 changed files with 71 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
editor/editor_properties.cpp
View File

@@ -61,7 +61,7 @@ void EditorPropertyText::_text_changed(const String &p_string) {
if (updating)
return;
emit_signal("property_changed", get_edited_property(), p_string, "", true);
emit_changed(get_edited_property(), p_string, "", true);
}
void EditorPropertyText::update_property() {
@@ -96,11 +96,11 @@ EditorPropertyText::EditorPropertyText() {
void EditorPropertyMultilineText::_big_text_changed() {
text->set_text(big_text->get_text());
emit_signal("property_changed", get_edited_property(), big_text->get_text(), "", true);
emit_changed(get_edited_property(), big_text->get_text(), "", true);
}
void EditorPropertyMultilineText::_text_changed() {
emit_signal("property_changed", get_edited_property(), text->get_text(), "", true);
emit_changed(get_edited_property(), text->get_text(), "", true);
}
void EditorPropertyMultilineText::_open_big_text() {
@@ -168,7 +168,7 @@ EditorPropertyMultilineText::EditorPropertyMultilineText() {
void EditorPropertyTextEnum::_option_selected(int p_which) {
emit_signal("property_changed", get_edited_property(), options->get_item_text(p_which));
emit_changed(get_edited_property(), options->get_item_text(p_which));
}
void EditorPropertyTextEnum::update_property() {
@@ -207,7 +207,7 @@ EditorPropertyTextEnum::EditorPropertyTextEnum() {
void EditorPropertyPath::_path_selected(const String &p_path) {
emit_signal("property_changed", get_edited_property(), p_path);
emit_changed(get_edited_property(), p_path);
update_property();
}
void EditorPropertyPath::_path_pressed() {
@@ -327,7 +327,7 @@ void EditorPropertyClassName::_property_selected() {
void EditorPropertyClassName::_dialog_created() {
selected_type = dialog->get_selected_type();
emit_signal("property_changed", get_edited_property(), selected_type);
emit_changed(get_edited_property(), selected_type);
update_property();
}
@@ -353,7 +353,7 @@ EditorPropertyClassName::EditorPropertyClassName() {
void EditorPropertyMember::_property_selected(const String &p_selected) {
emit_signal("property_changed", get_edited_property(), p_selected);
emit_changed(get_edited_property(), p_selected);
update_property();
}
@@ -457,7 +457,7 @@ EditorPropertyMember::EditorPropertyMember() {
///////////////////// CHECK /////////////////////////
void EditorPropertyCheck::_checkbox_pressed() {
emit_signal("property_changed", get_edited_property(), checkbox->is_pressed());
emit_changed(get_edited_property(), checkbox->is_pressed());
}
void EditorPropertyCheck::update_property() {
@@ -484,7 +484,7 @@ EditorPropertyCheck::EditorPropertyCheck() {
void EditorPropertyEnum::_option_selected(int p_which) {
int val = options->get_item_metadata(p_which);
emit_signal("property_changed", get_edited_property(), val);
emit_changed(get_edited_property(), val);
}
void EditorPropertyEnum::update_property() {
@@ -543,7 +543,7 @@ void EditorPropertyFlags::_flag_toggled() {
}
}
emit_signal("property_changed", get_edited_property(), value);
emit_changed(get_edited_property(), value);
}
void EditorPropertyFlags::update_property() {
@@ -691,7 +691,7 @@ public:
};
void EditorPropertyLayers::_grid_changed(uint32_t p_grid) {
emit_signal("property_changed", get_edited_property(), p_grid);
emit_changed(get_edited_property(), p_grid);
}
void EditorPropertyLayers::update_property() {
@@ -801,7 +801,7 @@ EditorPropertyLayers::EditorPropertyLayers() {
void EditorPropertyInteger::_value_changed(double val) {
if (setting)
return;
emit_signal("property_changed", get_edited_property(), int(val));
emit_changed(get_edited_property(), int(val));
}
void EditorPropertyInteger::update_property() {
@@ -878,7 +878,7 @@ void EditorPropertyFloat::_value_changed(double val) {
if (setting)
return;
emit_signal("property_changed", get_edited_property(), val);
emit_changed(get_edited_property(), val);
}
void EditorPropertyFloat::update_property() {
@@ -948,7 +948,7 @@ void EditorPropertyEasing::_drag_easing(const Ref<InputEvent> &p_ev) {
if (sg)
val = -val;
emit_signal("property_changed", get_edited_property(), val);
emit_changed(get_edited_property(), val);
easing_draw->update();
}
}
@@ -999,7 +999,7 @@ void EditorPropertyEasing::update_property() {
void EditorPropertyEasing::_set_preset(int p_preset) {
static const float preset_value[EASING_MAX] = { 0.0, 1.0, 2.0, 0.5, -2.0, -0.5 };
emit_signal("property_changed", get_edited_property(), preset_value[p_preset]);
emit_changed(get_edited_property(), preset_value[p_preset]);
easing_draw->update();
}
@@ -1063,7 +1063,7 @@ void EditorPropertyVector2::_value_changed(double val, const String &p_name) {
Vector2 v2;
v2.x = spin[0]->get_value();
v2.y = spin[1]->get_value();
emit_signal("property_changed", get_edited_property(), v2, p_name);
emit_changed(get_edited_property(), v2, p_name);
}
void EditorPropertyVector2::update_property() {
@@ -1146,7 +1146,7 @@ void EditorPropertyRect2::_value_changed(double val, const String &p_name) {
r2.position.y = spin[1]->get_value();
r2.size.x = spin[2]->get_value();
r2.size.y = spin[3]->get_value();
emit_signal("property_changed", get_edited_property(), r2, p_name);
emit_changed(get_edited_property(), r2, p_name);
}
void EditorPropertyRect2::update_property() {
@@ -1229,7 +1229,7 @@ void EditorPropertyVector3::_value_changed(double val, const String &p_name) {
v3.x = spin[0]->get_value();
v3.y = spin[1]->get_value();
v3.z = spin[2]->get_value();
emit_signal("property_changed", get_edited_property(), v3, p_name);
emit_changed(get_edited_property(), v3, p_name);
}
void EditorPropertyVector3::update_property() {
@@ -1310,7 +1310,7 @@ void EditorPropertyPlane::_value_changed(double val, const String &p_name) {
p.normal.y = spin[1]->get_value();
p.normal.z = spin[2]->get_value();
p.d = spin[3]->get_value();
emit_signal("property_changed", get_edited_property(), p, p_name);
emit_changed(get_edited_property(), p, p_name);
}
void EditorPropertyPlane::update_property() {
@@ -1394,7 +1394,7 @@ void EditorPropertyQuat::_value_changed(double val, const String &p_name) {
p.y = spin[1]->get_value();
p.z = spin[2]->get_value();
p.w = spin[3]->get_value();
emit_signal("property_changed", get_edited_property(), p, p_name);
emit_changed(get_edited_property(), p, p_name);
}
void EditorPropertyQuat::update_property() {
@@ -1480,7 +1480,7 @@ void EditorPropertyAABB::_value_changed(double val, const String &p_name) {
p.size.y = spin[4]->get_value();
p.size.z = spin[5]->get_value();
emit_signal("property_changed", get_edited_property(), p, p_name);
emit_changed(get_edited_property(), p, p_name);
}
void EditorPropertyAABB::update_property() {
@@ -1556,7 +1556,7 @@ void EditorPropertyTransform2D::_value_changed(double val, const String &p_name)
p[2][0] = spin[4]->get_value();
p[2][1] = spin[5]->get_value();
emit_signal("property_changed", get_edited_property(), p, p_name);
emit_changed(get_edited_property(), p, p_name);
}
void EditorPropertyTransform2D::update_property() {
@@ -1634,7 +1634,7 @@ void EditorPropertyBasis::_value_changed(double val, const String &p_name) {
p[1][2] = spin[7]->get_value();
p[2][2] = spin[8]->get_value();
emit_signal("property_changed", get_edited_property(), p, p_name);
emit_changed(get_edited_property(), p, p_name);
}
void EditorPropertyBasis::update_property() {
@@ -1718,7 +1718,7 @@ void EditorPropertyTransform::_value_changed(double val, const String &p_name) {
p.origin[1] = spin[10]->get_value();
p.origin[2] = spin[11]->get_value();
emit_signal("property_changed", get_edited_property(), p, p_name);
emit_changed(get_edited_property(), p, p_name);
}
void EditorPropertyTransform::update_property() {
@@ -1789,12 +1789,12 @@ EditorPropertyTransform::EditorPropertyTransform() {
void EditorPropertyColor::_color_changed(const Color &p_color) {
emit_signal("property_changed", get_edited_property(), p_color, "", true);
emit_changed(get_edited_property(), p_color, "", true);
}
void EditorPropertyColor::_popup_closed() {
emit_signal("property_changed", get_edited_property(), picker->get_pick_color(), "", false);
emit_changed(get_edited_property(), picker->get_pick_color(), "", false);
}
void EditorPropertyColor::_bind_methods() {
@@ -1855,7 +1855,7 @@ void EditorPropertyNodePath::_node_selected(const NodePath &p_path) {
if (base_node) { // for AnimationTrackKeyEdit
path = base_node->get_path().rel_path_to(p_path);
}
emit_signal("property_changed", get_edited_property(), path);
emit_changed(get_edited_property(), path);
update_property();
}
@@ -1872,7 +1872,7 @@ void EditorPropertyNodePath::_node_assign() {
void EditorPropertyNodePath::_node_clear() {
emit_signal("property_changed", get_edited_property(), NodePath());
emit_changed(get_edited_property(), NodePath());
update_property();
}
@@ -2005,7 +2005,7 @@ void EditorPropertyResource::_file_selected(const String &p_path) {
EditorNode::get_singleton()->show_warning(vformat(TTR("The selected resource (%s) does not match any type expected for this property (%s)."), res->get_class(), property_types));
}
emit_signal("property_changed", get_edited_property(), res);
emit_changed(get_edited_property(), res);
update_property();
}
@@ -2054,7 +2054,7 @@ void EditorPropertyResource::_menu_option(int p_which) {
} break;
case OBJ_MENU_CLEAR: {
emit_signal("property_changed", get_edited_property(), RES());
emit_changed(get_edited_property(), RES());
update_property();
} break;
@@ -2096,7 +2096,7 @@ void EditorPropertyResource::_menu_option(int p_which) {
res->set(p.first, p.second);
}
emit_signal("property_changed", get_edited_property(), res);
emit_changed(get_edited_property(), res);
update_property();
} break;
@@ -2117,7 +2117,7 @@ void EditorPropertyResource::_menu_option(int p_which) {
case OBJ_MENU_PASTE: {
RES res = EditorSettings::get_singleton()->get_resource_clipboard();
emit_signal("property_changed", get_edited_property(), res);
emit_changed(get_edited_property(), res);
update_property();
} break;
@@ -2151,7 +2151,7 @@ void EditorPropertyResource::_menu_option(int p_which) {
Ref<Resource> new_res = conversions[to_type]->convert(res);
emit_signal("property_changed", get_edited_property(), new_res);
emit_changed(get_edited_property(), new_res);
update_property();
break;
}
@@ -2202,7 +2202,7 @@ void EditorPropertyResource::_menu_option(int p_which) {
}
res = Ref<Resource>(resp);
emit_signal("property_changed", get_edited_property(), res);
emit_changed(get_edited_property(), res);
update_property();
} break;
@@ -2585,7 +2585,7 @@ void EditorPropertyResource::_viewport_selected(const NodePath &p_path) {
vt->set_viewport_path_in_scene(get_tree()->get_edited_scene_root()->get_path_to(to_node));
vt->setup_local_to_scene();
emit_signal("property_changed", get_edited_property(), vt);
emit_changed(get_edited_property(), vt);
update_property();
}
@@ -2671,7 +2671,7 @@ void EditorPropertyResource::drop_data_fw(const Point2 &p_point, const Variant &
if (drag_data.has("type") && String(drag_data["type"]) == "resource") {
Ref<Resource> res = drag_data["resource"];
if (res.is_valid()) {
emit_signal("property_changed", get_edited_property(), res);
emit_changed(get_edited_property(), res);
update_property();
return;
}
@@ -2685,7 +2685,7 @@ void EditorPropertyResource::drop_data_fw(const Point2 &p_point, const Variant &
String file = files[0];
RES res = ResourceLoader::load(file);
if (res.is_valid()) {
emit_signal("property_changed", get_edited_property(), res);
emit_changed(get_edited_property(), res);
update_property();
return;
}