gaming/godot
gaming/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot synced 2024-09-16 01:20:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21701 from AlexHolly/fix-multiselect-proptery-change

Browse source 
Fix multiselect change property
This commit is contained in:
Juan Linietsky 2019-01-18 12:37:50 -03:00 committed by GitHub
parent e3ef52a270 66d8ce0c05
commit 580bebda52
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 45 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
editor/editor_inspector.cpp
View file

@ -1965,14 +1965,14 @@ void EditorInspector::_edit_set(const String &p_name, const Variant &p_value, bo
} }
} }
void EditorInspector::_property_changed(const String &p_path, const Variant &p_value, bool changing) { void EditorInspector::_property_changed(const String &p_path, const Variant &p_value, const String &p_name, bool changing) {
// The "changing" variable must be true for properties that trigger events as typing occurs, // The "changing" variable must be true for properties that trigger events as typing occurs,
// like "text_changed" signal. eg: Text property of Label, Button, RichTextLabel, etc. // like "text_changed" signal. eg: Text property of Label, Button, RichTextLabel, etc.
if (changing) if (changing)
this->changing++; this->changing++;
_edit_set(p_path, p_value, false, ""); _edit_set(p_path, p_value, false, p_name);
if (changing) if (changing)
this->changing--; this->changing--;
@ -2199,7 +2199,7 @@ String EditorInspector::get_object_class() const {
void EditorInspector::_bind_methods() { void EditorInspector::_bind_methods() {
ClassDB::bind_method("_property_changed", &EditorInspector::_property_changed, DEFVAL(false)); ClassDB::bind_method("_property_changed", &EditorInspector::_property_changed, DEFVAL(""), DEFVAL(false));
ClassDB::bind_method("_multiple_properties_changed", &EditorInspector::_multiple_properties_changed); ClassDB::bind_method("_multiple_properties_changed", &EditorInspector::_multiple_properties_changed);
ClassDB::bind_method("_property_changed_update_all", &EditorInspector::_property_changed_update_all); ClassDB::bind_method("_property_changed_update_all", &EditorInspector::_property_changed_update_all);

2
editor/editor_inspector.h
View file

@ -299,7 +299,7 @@ class EditorInspector : public ScrollContainer {
void _edit_set(const String &p_name, const Variant &p_value, bool p_refresh_all, const String &p_changed_field); void _edit_set(const String &p_name, const Variant &p_value, bool p_refresh_all, const String &p_changed_field);
void _property_changed(const String &p_path, const Variant &p_value, bool changing = false); void _property_changed(const String &p_path, const Variant &p_value, const String &p_name = "", bool changing = false);
void _property_changed_update_all(const String &p_path, const Variant &p_value); void _property_changed_update_all(const String &p_path, const Variant &p_value);
void _multiple_properties_changed(Vector<String> p_paths, Array p_values); void _multiple_properties_changed(Vector<String> p_paths, Array p_values);
void _property_keyed(const String &p_path, bool p_advance); void _property_keyed(const String &p_path, bool p_advance);

64
editor/editor_properties.cpp
View file

@ -61,7 +61,7 @@ void EditorPropertyText::_text_changed(const String &p_string) {
if (updating) if (updating)
return; return;
emit_signal("property_changed", get_edited_property(), p_string, true); emit_signal("property_changed", get_edited_property(), p_string, "", true);
} }
void EditorPropertyText::update_property() { void EditorPropertyText::update_property() {
@ -96,11 +96,11 @@ EditorPropertyText::EditorPropertyText() {
void EditorPropertyMultilineText::_big_text_changed() { void EditorPropertyMultilineText::_big_text_changed() {
text->set_text(big_text->get_text()); text->set_text(big_text->get_text());
emit_signal("property_changed", get_edited_property(), big_text->get_text(), true); emit_signal("property_changed", get_edited_property(), big_text->get_text(), "", true);
} }
void EditorPropertyMultilineText::_text_changed() { void EditorPropertyMultilineText::_text_changed() {
emit_signal("property_changed", get_edited_property(), text->get_text(), true); emit_signal("property_changed", get_edited_property(), text->get_text(), "", true);
} }
void EditorPropertyMultilineText::_open_big_text() { void EditorPropertyMultilineText::_open_big_text() {
@ -1056,14 +1056,14 @@ EditorPropertyEasing::EditorPropertyEasing() {
///////////////////// VECTOR2 ///////////////////////// ///////////////////// VECTOR2 /////////////////////////
void EditorPropertyVector2::_value_changed(double val) { void EditorPropertyVector2::_value_changed(double val, const String &p_name) {
if (setting) if (setting)
return; return;
Vector2 v2; Vector2 v2;
v2.x = spin[0]->get_value(); v2.x = spin[0]->get_value();
v2.y = spin[1]->get_value(); v2.y = spin[1]->get_value();
emit_signal("property_changed", get_edited_property(), v2); emit_signal("property_changed", get_edited_property(), v2, p_name);
} }
void EditorPropertyVector2::update_property() { void EditorPropertyVector2::update_property() {
@ -1123,7 +1123,7 @@ EditorPropertyVector2::EditorPropertyVector2() {
spin[i]->set_label(desc[i]); spin[i]->set_label(desc[i]);
bc->add_child(spin[i]); bc->add_child(spin[i]);
add_focusable(spin[i]); add_focusable(spin[i]);
spin[i]->connect("value_changed", this, "_value_changed"); spin[i]->connect("value_changed", this, "_value_changed", varray(desc[i]));
if (horizontal) { if (horizontal) {
spin[i]->set_h_size_flags(SIZE_EXPAND_FILL); spin[i]->set_h_size_flags(SIZE_EXPAND_FILL);
} }
@ -1137,7 +1137,7 @@ EditorPropertyVector2::EditorPropertyVector2() {
///////////////////// RECT2 ///////////////////////// ///////////////////// RECT2 /////////////////////////
void EditorPropertyRect2::_value_changed(double val) { void EditorPropertyRect2::_value_changed(double val, const String &p_name) {
if (setting) if (setting)
return; return;
@ -1146,7 +1146,7 @@ void EditorPropertyRect2::_value_changed(double val) {
r2.position.y = spin[1]->get_value(); r2.position.y = spin[1]->get_value();
r2.size.x = spin[2]->get_value(); r2.size.x = spin[2]->get_value();
r2.size.y = spin[3]->get_value(); r2.size.y = spin[3]->get_value();
emit_signal("property_changed", get_edited_property(), r2); emit_signal("property_changed", get_edited_property(), r2, p_name);
} }
void EditorPropertyRect2::update_property() { void EditorPropertyRect2::update_property() {
@ -1207,7 +1207,7 @@ EditorPropertyRect2::EditorPropertyRect2() {
spin[i]->set_flat(true); spin[i]->set_flat(true);
bc->add_child(spin[i]); bc->add_child(spin[i]);
add_focusable(spin[i]); add_focusable(spin[i]);
spin[i]->connect("value_changed", this, "_value_changed"); spin[i]->connect("value_changed", this, "_value_changed", varray(desc[i]));
if (horizontal) { if (horizontal) {
spin[i]->set_h_size_flags(SIZE_EXPAND_FILL); spin[i]->set_h_size_flags(SIZE_EXPAND_FILL);
} }
@ -1221,7 +1221,7 @@ EditorPropertyRect2::EditorPropertyRect2() {
///////////////////// VECTOR3 ///////////////////////// ///////////////////// VECTOR3 /////////////////////////
void EditorPropertyVector3::_value_changed(double val) { void EditorPropertyVector3::_value_changed(double val, const String &p_name) {
if (setting) if (setting)
return; return;
@ -1229,7 +1229,7 @@ void EditorPropertyVector3::_value_changed(double val) {
v3.x = spin[0]->get_value(); v3.x = spin[0]->get_value();
v3.y = spin[1]->get_value(); v3.y = spin[1]->get_value();
v3.z = spin[2]->get_value(); v3.z = spin[2]->get_value();
emit_signal("property_changed", get_edited_property(), v3); emit_signal("property_changed", get_edited_property(), v3, p_name);
} }
void EditorPropertyVector3::update_property() { void EditorPropertyVector3::update_property() {
@ -1288,7 +1288,7 @@ EditorPropertyVector3::EditorPropertyVector3() {
spin[i]->set_label(desc[i]); spin[i]->set_label(desc[i]);
bc->add_child(spin[i]); bc->add_child(spin[i]);
add_focusable(spin[i]); add_focusable(spin[i]);
spin[i]->connect("value_changed", this, "_value_changed"); spin[i]->connect("value_changed", this, "_value_changed", varray(desc[i]));
if (horizontal) { if (horizontal) {
spin[i]->set_h_size_flags(SIZE_EXPAND_FILL); spin[i]->set_h_size_flags(SIZE_EXPAND_FILL);
} }
@ -1301,7 +1301,7 @@ EditorPropertyVector3::EditorPropertyVector3() {
} }
///////////////////// PLANE ///////////////////////// ///////////////////// PLANE /////////////////////////
void EditorPropertyPlane::_value_changed(double val) { void EditorPropertyPlane::_value_changed(double val, const String &p_name) {
if (setting) if (setting)
return; return;
@ -1310,7 +1310,7 @@ void EditorPropertyPlane::_value_changed(double val) {
p.normal.y = spin[1]->get_value(); p.normal.y = spin[1]->get_value();
p.normal.z = spin[2]->get_value(); p.normal.z = spin[2]->get_value();
p.d = spin[3]->get_value(); p.d = spin[3]->get_value();
emit_signal("property_changed", get_edited_property(), p); emit_signal("property_changed", get_edited_property(), p, p_name);
} }
void EditorPropertyPlane::update_property() { void EditorPropertyPlane::update_property() {
@ -1371,7 +1371,7 @@ EditorPropertyPlane::EditorPropertyPlane() {
spin[i]->set_label(desc[i]); spin[i]->set_label(desc[i]);
bc->add_child(spin[i]); bc->add_child(spin[i]);
add_focusable(spin[i]); add_focusable(spin[i]);
spin[i]->connect("value_changed", this, "_value_changed"); spin[i]->connect("value_changed", this, "_value_changed", varray(desc[i]));
if (horizontal) { if (horizontal) {
spin[i]->set_h_size_flags(SIZE_EXPAND_FILL); spin[i]->set_h_size_flags(SIZE_EXPAND_FILL);
} }
@ -1385,7 +1385,7 @@ EditorPropertyPlane::EditorPropertyPlane() {
///////////////////// QUAT ///////////////////////// ///////////////////// QUAT /////////////////////////
void EditorPropertyQuat::_value_changed(double val) { void EditorPropertyQuat::_value_changed(double val, const String &p_name) {
if (setting) if (setting)
return; return;
@ -1394,7 +1394,7 @@ void EditorPropertyQuat::_value_changed(double val) {
p.y = spin[1]->get_value(); p.y = spin[1]->get_value();
p.z = spin[2]->get_value(); p.z = spin[2]->get_value();
p.w = spin[3]->get_value(); p.w = spin[3]->get_value();
emit_signal("property_changed", get_edited_property(), p); emit_signal("property_changed", get_edited_property(), p, p_name);
} }
void EditorPropertyQuat::update_property() { void EditorPropertyQuat::update_property() {
@ -1454,7 +1454,7 @@ EditorPropertyQuat::EditorPropertyQuat() {
spin[i]->set_label(desc[i]); spin[i]->set_label(desc[i]);
bc->add_child(spin[i]); bc->add_child(spin[i]);
add_focusable(spin[i]); add_focusable(spin[i]);
spin[i]->connect("value_changed", this, "_value_changed"); spin[i]->connect("value_changed", this, "_value_changed", varray(desc[i]));
if (horizontal) { if (horizontal) {
spin[i]->set_h_size_flags(SIZE_EXPAND_FILL); spin[i]->set_h_size_flags(SIZE_EXPAND_FILL);
} }
@ -1468,7 +1468,7 @@ EditorPropertyQuat::EditorPropertyQuat() {
///////////////////// AABB ///////////////////////// ///////////////////// AABB /////////////////////////
void EditorPropertyAABB::_value_changed(double val) { void EditorPropertyAABB::_value_changed(double val, const String &p_name) {
if (setting) if (setting)
return; return;
@ -1480,7 +1480,7 @@ void EditorPropertyAABB::_value_changed(double val) {
p.size.y = spin[4]->get_value(); p.size.y = spin[4]->get_value();
p.size.z = spin[5]->get_value(); p.size.z = spin[5]->get_value();
emit_signal("property_changed", get_edited_property(), p); emit_signal("property_changed", get_edited_property(), p, p_name);
} }
void EditorPropertyAABB::update_property() { void EditorPropertyAABB::update_property() {
@ -1536,7 +1536,7 @@ EditorPropertyAABB::EditorPropertyAABB() {
g->add_child(spin[i]); g->add_child(spin[i]);
spin[i]->set_h_size_flags(SIZE_EXPAND_FILL); spin[i]->set_h_size_flags(SIZE_EXPAND_FILL);
add_focusable(spin[i]); add_focusable(spin[i]);
spin[i]->connect("value_changed", this, "_value_changed"); spin[i]->connect("value_changed", this, "_value_changed", varray(desc[i]));
} }
set_bottom_editor(g); set_bottom_editor(g);
setting = false; setting = false;
@ -1544,7 +1544,7 @@ EditorPropertyAABB::EditorPropertyAABB() {
///////////////////// TRANSFORM2D ///////////////////////// ///////////////////// TRANSFORM2D /////////////////////////
void EditorPropertyTransform2D::_value_changed(double val) { void EditorPropertyTransform2D::_value_changed(double val, const String &p_name) {
if (setting) if (setting)
return; return;
@ -1556,7 +1556,7 @@ void EditorPropertyTransform2D::_value_changed(double val) {
p[2][0] = spin[4]->get_value(); p[2][0] = spin[4]->get_value();
p[2][1] = spin[5]->get_value(); p[2][1] = spin[5]->get_value();
emit_signal("property_changed", get_edited_property(), p); emit_signal("property_changed", get_edited_property(), p, p_name);
} }
void EditorPropertyTransform2D::update_property() { void EditorPropertyTransform2D::update_property() {
@ -1611,7 +1611,7 @@ EditorPropertyTransform2D::EditorPropertyTransform2D() {
g->add_child(spin[i]); g->add_child(spin[i]);
spin[i]->set_h_size_flags(SIZE_EXPAND_FILL); spin[i]->set_h_size_flags(SIZE_EXPAND_FILL);
add_focusable(spin[i]); add_focusable(spin[i]);
spin[i]->connect("value_changed", this, "_value_changed"); spin[i]->connect("value_changed", this, "_value_changed", varray(desc[i]));
} }
set_bottom_editor(g); set_bottom_editor(g);
setting = false; setting = false;
@ -1619,7 +1619,7 @@ EditorPropertyTransform2D::EditorPropertyTransform2D() {
///////////////////// BASIS ///////////////////////// ///////////////////// BASIS /////////////////////////
void EditorPropertyBasis::_value_changed(double val) { void EditorPropertyBasis::_value_changed(double val, const String &p_name) {
if (setting) if (setting)
return; return;
@ -1634,7 +1634,7 @@ void EditorPropertyBasis::_value_changed(double val) {
p[1][2] = spin[7]->get_value(); p[1][2] = spin[7]->get_value();
p[2][2] = spin[8]->get_value(); p[2][2] = spin[8]->get_value();
emit_signal("property_changed", get_edited_property(), p); emit_signal("property_changed", get_edited_property(), p, p_name);
} }
void EditorPropertyBasis::update_property() { void EditorPropertyBasis::update_property() {
@ -1692,7 +1692,7 @@ EditorPropertyBasis::EditorPropertyBasis() {
g->add_child(spin[i]); g->add_child(spin[i]);
spin[i]->set_h_size_flags(SIZE_EXPAND_FILL); spin[i]->set_h_size_flags(SIZE_EXPAND_FILL);
add_focusable(spin[i]); add_focusable(spin[i]);
spin[i]->connect("value_changed", this, "_value_changed"); spin[i]->connect("value_changed", this, "_value_changed", varray(desc[i]));
} }
set_bottom_editor(g); set_bottom_editor(g);
setting = false; setting = false;
@ -1700,7 +1700,7 @@ EditorPropertyBasis::EditorPropertyBasis() {
///////////////////// TRANSFORM ///////////////////////// ///////////////////// TRANSFORM /////////////////////////
void EditorPropertyTransform::_value_changed(double val) { void EditorPropertyTransform::_value_changed(double val, const String &p_name) {
if (setting) if (setting)
return; return;
@ -1718,7 +1718,7 @@ void EditorPropertyTransform::_value_changed(double val) {
p.origin[1] = spin[10]->get_value(); p.origin[1] = spin[10]->get_value();
p.origin[2] = spin[11]->get_value(); p.origin[2] = spin[11]->get_value();
emit_signal("property_changed", get_edited_property(), p); emit_signal("property_changed", get_edited_property(), p, p_name);
} }
void EditorPropertyTransform::update_property() { void EditorPropertyTransform::update_property() {
@ -1779,7 +1779,7 @@ EditorPropertyTransform::EditorPropertyTransform() {
g->add_child(spin[i]); g->add_child(spin[i]);
spin[i]->set_h_size_flags(SIZE_EXPAND_FILL); spin[i]->set_h_size_flags(SIZE_EXPAND_FILL);
add_focusable(spin[i]); add_focusable(spin[i]);
spin[i]->connect("value_changed", this, "_value_changed"); spin[i]->connect("value_changed", this, "_value_changed", varray(desc[i]));
} }
set_bottom_editor(g); set_bottom_editor(g);
setting = false; setting = false;
@ -1789,12 +1789,12 @@ EditorPropertyTransform::EditorPropertyTransform() {
void EditorPropertyColor::_color_changed(const Color &p_color) { void EditorPropertyColor::_color_changed(const Color &p_color) {
emit_signal("property_changed", get_edited_property(), p_color, true); emit_signal("property_changed", get_edited_property(), p_color, "", true);
} }
void EditorPropertyColor::_popup_closed() { void EditorPropertyColor::_popup_closed() {
emit_signal("property_changed", get_edited_property(), picker->get_pick_color(), false); emit_signal("property_changed", get_edited_property(), picker->get_pick_color(), "", false);
} }
void EditorPropertyColor::_bind_methods() { void EditorPropertyColor::_bind_methods() {

18
editor/editor_properties.h
View file

@ -338,7 +338,7 @@ class EditorPropertyVector2 : public EditorProperty {
GDCLASS(EditorPropertyVector2, EditorProperty) GDCLASS(EditorPropertyVector2, EditorProperty)
EditorSpinSlider *spin[2]; EditorSpinSlider *spin[2];
bool setting; bool setting;
void _value_changed(double p_val); void _value_changed(double p_val, const String &p_name);
protected: protected:
void _notification(int p_what); void _notification(int p_what);
@ -354,7 +354,7 @@ class EditorPropertyRect2 : public EditorProperty {
GDCLASS(EditorPropertyRect2, EditorProperty) GDCLASS(EditorPropertyRect2, EditorProperty)
EditorSpinSlider *spin[4]; EditorSpinSlider *spin[4];
bool setting; bool setting;
void _value_changed(double p_val); void _value_changed(double p_val, const String &p_name);
protected: protected:
void _notification(int p_what); void _notification(int p_what);
@ -370,7 +370,7 @@ class EditorPropertyVector3 : public EditorProperty {
GDCLASS(EditorPropertyVector3, EditorProperty) GDCLASS(EditorPropertyVector3, EditorProperty)
EditorSpinSlider *spin[3]; EditorSpinSlider *spin[3];
bool setting; bool setting;
void _value_changed(double p_val); void _value_changed(double p_val, const String &p_name);
protected: protected:
void _notification(int p_what); void _notification(int p_what);
@ -386,7 +386,7 @@ class EditorPropertyPlane : public EditorProperty {
GDCLASS(EditorPropertyPlane, EditorProperty) GDCLASS(EditorPropertyPlane, EditorProperty)
EditorSpinSlider *spin[4]; EditorSpinSlider *spin[4];
bool setting; bool setting;
void _value_changed(double p_val); void _value_changed(double p_val, const String &p_name);
protected: protected:
void _notification(int p_what); void _notification(int p_what);
@ -402,7 +402,7 @@ class EditorPropertyQuat : public EditorProperty {
GDCLASS(EditorPropertyQuat, EditorProperty) GDCLASS(EditorPropertyQuat, EditorProperty)
EditorSpinSlider *spin[4]; EditorSpinSlider *spin[4];
bool setting; bool setting;
void _value_changed(double p_val); void _value_changed(double p_val, const String &p_name);
protected: protected:
void _notification(int p_what); void _notification(int p_what);
@ -418,7 +418,7 @@ class EditorPropertyAABB : public EditorProperty {
GDCLASS(EditorPropertyAABB, EditorProperty) GDCLASS(EditorPropertyAABB, EditorProperty)
EditorSpinSlider *spin[6]; EditorSpinSlider *spin[6];
bool setting; bool setting;
void _value_changed(double p_val); void _value_changed(double p_val, const String &p_name);
protected: protected:
void _notification(int p_what); void _notification(int p_what);
@ -434,7 +434,7 @@ class EditorPropertyTransform2D : public EditorProperty {
GDCLASS(EditorPropertyTransform2D, EditorProperty) GDCLASS(EditorPropertyTransform2D, EditorProperty)
EditorSpinSlider *spin[6]; EditorSpinSlider *spin[6];
bool setting; bool setting;
void _value_changed(double p_val); void _value_changed(double p_val, const String &p_name);
protected: protected:
void _notification(int p_what); void _notification(int p_what);
@ -450,7 +450,7 @@ class EditorPropertyBasis : public EditorProperty {
GDCLASS(EditorPropertyBasis, EditorProperty) GDCLASS(EditorPropertyBasis, EditorProperty)
EditorSpinSlider *spin[9]; EditorSpinSlider *spin[9];
bool setting; bool setting;
void _value_changed(double p_val); void _value_changed(double p_val, const String &p_name);
protected: protected:
void _notification(int p_what); void _notification(int p_what);
@ -466,7 +466,7 @@ class EditorPropertyTransform : public EditorProperty {
GDCLASS(EditorPropertyTransform, EditorProperty) GDCLASS(EditorPropertyTransform, EditorProperty)
EditorSpinSlider *spin[12]; EditorSpinSlider *spin[12];
bool setting; bool setting;
void _value_changed(double p_val); void _value_changed(double p_val, const String &p_name);
protected: protected:
void _notification(int p_what); void _notification(int p_what);