diff options
author | Rémi Verschelde <remi@verschelde.fr> | 2021-11-04 00:18:44 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-04 00:18:44 +0100 |
commit | 78931aa040bb0d0586345f95cc982605c0720ba1 (patch) | |
tree | fd79549cd57fd58007c0f6a2e0a3d589e7a7f9d8 /scene/gui | |
parent | 536757b80b092a0cc3b2819d502e0129196d6a19 (diff) | |
parent | c012fbc8b235b86ed70c501834825d91292f8811 (diff) |
Merge pull request #54571 from Calinou/rename-noeditor-property-hint
Diffstat (limited to 'scene/gui')
-rw-r--r-- | scene/gui/line_edit.cpp | 2 | ||||
-rw-r--r-- | scene/gui/option_button.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scene/gui/line_edit.cpp b/scene/gui/line_edit.cpp index 8c33d306a1..0b85b4d3d2 100644 --- a/scene/gui/line_edit.cpp +++ b/scene/gui/line_edit.cpp @@ -2135,7 +2135,7 @@ void LineEdit::_get_property_list(List<PropertyInfo> *p_list) const { void LineEdit::_validate_property(PropertyInfo &property) const { if (!caret_blink_enabled && property.name == "caret_blink_speed") { - property.usage = PROPERTY_USAGE_NOEDITOR; + property.usage = PROPERTY_USAGE_NO_EDITOR; } } diff --git a/scene/gui/option_button.cpp b/scene/gui/option_button.cpp index c00c040048..dcf3cfeb09 100644 --- a/scene/gui/option_button.cpp +++ b/scene/gui/option_button.cpp @@ -332,7 +332,7 @@ void OptionButton::_bind_methods() { ClassDB::bind_method(D_METHOD("_set_items"), &OptionButton::_set_items); ClassDB::bind_method(D_METHOD("_get_items"), &OptionButton::_get_items); - ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "items", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL), "_set_items", "_get_items"); + ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "items", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_INTERNAL), "_set_items", "_get_items"); // "selected" property must come after "items", otherwise GH-10213 occurs. ADD_PROPERTY(PropertyInfo(Variant::INT, "selected"), "_select_int", "get_selected"); ADD_SIGNAL(MethodInfo("item_selected", PropertyInfo(Variant::INT, "index"))); |