Hide more options of disabled properties

This commit is contained in:
Michael Alexsander 2021-03-03 20:51:35 -03:00
parent 864caf5711
commit 4be282a269
20 changed files with 51 additions and 32 deletions

View file

@ -569,6 +569,7 @@ void Camera2D::_set_old_smoothing(float p_enable) {
void Camera2D::set_enable_follow_smoothing(bool p_enabled) { void Camera2D::set_enable_follow_smoothing(bool p_enabled) {
smoothing_enabled = p_enabled; smoothing_enabled = p_enabled;
notify_property_list_changed();
} }
bool Camera2D::is_follow_smoothing_enabled() const { bool Camera2D::is_follow_smoothing_enabled() const {
@ -642,6 +643,12 @@ bool Camera2D::is_margin_drawing_enabled() const {
return margin_drawing_enabled; return margin_drawing_enabled;
} }
void Camera2D::_validate_property(PropertyInfo &property) const {
if (!smoothing_enabled && property.name == "smoothing_speed") {
property.usage = PROPERTY_USAGE_NOEDITOR;
}
}
void Camera2D::_bind_methods() { void Camera2D::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_offset", "offset"), &Camera2D::set_offset); ClassDB::bind_method(D_METHOD("set_offset", "offset"), &Camera2D::set_offset);
ClassDB::bind_method(D_METHOD("get_offset"), &Camera2D::get_offset); ClassDB::bind_method(D_METHOD("get_offset"), &Camera2D::get_offset);

View file

@ -97,8 +97,10 @@ protected:
protected: protected:
virtual Transform2D get_camera_transform(); virtual Transform2D get_camera_transform();
void _notification(int p_what); void _notification(int p_what);
static void _bind_methods(); static void _bind_methods();
void _validate_property(PropertyInfo &property) const override;
public: public:
void set_offset(const Vector2 &p_offset); void set_offset(const Vector2 &p_offset);

View file

@ -159,6 +159,7 @@ int Light2D::get_item_shadow_cull_mask() const {
void Light2D::set_shadow_enabled(bool p_enabled) { void Light2D::set_shadow_enabled(bool p_enabled) {
shadow = p_enabled; shadow = p_enabled;
RS::get_singleton()->canvas_light_set_shadow_enabled(canvas_light, shadow); RS::get_singleton()->canvas_light_set_shadow_enabled(canvas_light, shadow);
notify_property_list_changed();
} }
bool Light2D::is_shadow_enabled() const { bool Light2D::is_shadow_enabled() const {
@ -221,6 +222,12 @@ float Light2D::get_shadow_smooth() const {
return shadow_smooth; return shadow_smooth;
} }
void Light2D::_validate_property(PropertyInfo &property) const {
if (!shadow && (property.name == "shadow_color" || property.name == "shadow_filter" || property.name == "shadow_filter_smooth" || property.name == "shadow_item_cull_mask")) {
property.usage = PROPERTY_USAGE_NOEDITOR;
}
}
void Light2D::_bind_methods() { void Light2D::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_enabled", "enabled"), &Light2D::set_enabled); ClassDB::bind_method(D_METHOD("set_enabled", "enabled"), &Light2D::set_enabled);
ClassDB::bind_method(D_METHOD("is_enabled"), &Light2D::is_enabled); ClassDB::bind_method(D_METHOD("is_enabled"), &Light2D::is_enabled);

View file

@ -77,6 +77,7 @@ protected:
_FORCE_INLINE_ RID _get_light() const { return canvas_light; } _FORCE_INLINE_ RID _get_light() const { return canvas_light; }
void _notification(int p_what); void _notification(int p_what);
static void _bind_methods(); static void _bind_methods();
void _validate_property(PropertyInfo &property) const override;
public: public:
void set_enabled(bool p_enabled); void set_enabled(bool p_enabled);

View file

@ -88,13 +88,13 @@ bool Polygon2D::_edit_is_selected_on_click(const Point2 &p_point, double p_toler
} }
return Geometry2D::is_point_in_polygon(p_point - get_offset(), polygon2d); return Geometry2D::is_point_in_polygon(p_point - get_offset(), polygon2d);
} }
#endif
void Polygon2D::_validate_property(PropertyInfo &property) const { void Polygon2D::_validate_property(PropertyInfo &property) const {
if (!invert && property.name == "invert_border") { if (!invert && property.name == "invert_border") {
property.usage = PROPERTY_USAGE_NOEDITOR; property.usage = PROPERTY_USAGE_NOEDITOR;
} }
} }
#endif
void Polygon2D::_skeleton_bone_setup_changed() { void Polygon2D::_skeleton_bone_setup_changed() {
update(); update();

View file

@ -72,13 +72,10 @@ class Polygon2D : public Node2D {
void _skeleton_bone_setup_changed(); void _skeleton_bone_setup_changed();
#ifdef TOOLS_ENABLED
void _validate_property(PropertyInfo &property) const override;
#endif
protected: protected:
void _notification(int p_what); void _notification(int p_what);
static void _bind_methods(); static void _bind_methods();
void _validate_property(PropertyInfo &property) const override;
public: public:
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED

View file

@ -154,13 +154,11 @@ Vector<Face3> Decal::get_faces(uint32_t p_usage_flags) const {
return Vector<Face3>(); return Vector<Face3>();
} }
#ifdef TOOLS_ENABLED
void Decal::_validate_property(PropertyInfo &property) const { void Decal::_validate_property(PropertyInfo &property) const {
if (!distance_fade_enabled && (property.name == "distance_fade_begin" || property.name == "distance_fade_length")) { if (!distance_fade_enabled && (property.name == "distance_fade_begin" || property.name == "distance_fade_length")) {
property.usage = PROPERTY_USAGE_NOEDITOR; property.usage = PROPERTY_USAGE_NOEDITOR;
} }
} }
#endif
void Decal::_bind_methods() { void Decal::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_extents", "extents"), &Decal::set_extents); ClassDB::bind_method(D_METHOD("set_extents", "extents"), &Decal::set_extents);

View file

@ -62,12 +62,9 @@ private:
float distance_fade_begin = 10.0; float distance_fade_begin = 10.0;
float distance_fade_length = 1.0; float distance_fade_length = 1.0;
#ifdef TOOLS_ENABLED
void _validate_property(PropertyInfo &property) const override;
#endif
protected: protected:
static void _bind_methods(); static void _bind_methods();
void _validate_property(PropertyInfo &property) const override;
public: public:
void set_extents(const Vector3 &p_extents); void set_extents(const Vector3 &p_extents);

View file

@ -204,7 +204,7 @@ bool Light3D::is_editor_only() const {
} }
void Light3D::_validate_property(PropertyInfo &property) const { void Light3D::_validate_property(PropertyInfo &property) const {
if (!shadow && (property.name == "shadow_color" || property.name == "shadow_color" || property.name == "shadow_bias" || property.name == "shadow_normal_bias" || property.name == "shadow_reverse_cull_face" || property.name == "shadow_transmittance_bias" || property.name == "shadow_blur")) { if (!shadow && (property.name == "shadow_color" || property.name == "shadow_bias" || property.name == "shadow_normal_bias" || property.name == "shadow_reverse_cull_face" || property.name == "shadow_transmittance_bias" || property.name == "shadow_fog_fade" || property.name == "shadow_blur")) {
property.usage = PROPERTY_USAGE_NOEDITOR; property.usage = PROPERTY_USAGE_NOEDITOR;
} }

View file

@ -625,11 +625,9 @@ void Sprite3D::_validate_property(PropertyInfo &property) const {
property.usage |= PROPERTY_USAGE_KEYING_INCREMENTS; property.usage |= PROPERTY_USAGE_KEYING_INCREMENTS;
} }
#ifdef TOOLS_ENABLED
if (!region && property.name == "region_rect") { if (!region && property.name == "region_rect") {
property.usage = PROPERTY_USAGE_NOEDITOR; property.usage = PROPERTY_USAGE_NOEDITOR;
} }
#endif
} }
void Sprite3D::_bind_methods() { void Sprite3D::_bind_methods() {

View file

@ -1135,6 +1135,8 @@ void LineEdit::cursor_set_blink_enabled(const bool p_enabled) {
} }
draw_caret = true; draw_caret = true;
notify_property_list_changed();
} }
bool LineEdit::cursor_get_force_displayed() const { bool LineEdit::cursor_get_force_displayed() const {
@ -2056,6 +2058,12 @@ void LineEdit::_get_property_list(List<PropertyInfo> *p_list) const {
p_list->push_back(PropertyInfo(Variant::NIL, "opentype_features/_new", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_EDITOR)); p_list->push_back(PropertyInfo(Variant::NIL, "opentype_features/_new", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_EDITOR));
} }
void LineEdit::_validate_property(PropertyInfo &property) const {
if (!caret_blink_enabled && property.name == "caret_blink_speed") {
property.usage = PROPERTY_USAGE_NOEDITOR;
}
}
void LineEdit::_bind_methods() { void LineEdit::_bind_methods() {
ClassDB::bind_method(D_METHOD("_text_changed"), &LineEdit::_text_changed); ClassDB::bind_method(D_METHOD("_text_changed"), &LineEdit::_text_changed);

View file

@ -197,15 +197,15 @@ private:
void _backspace(bool p_word = false, bool p_all_to_left = false); void _backspace(bool p_word = false, bool p_all_to_left = false);
void _delete(bool p_word = false, bool p_all_to_right = false); void _delete(bool p_word = false, bool p_all_to_right = false);
void _gui_input(Ref<InputEvent> p_event);
void _notification(int p_what);
protected: protected:
void _notification(int p_what);
static void _bind_methods(); static void _bind_methods();
void _gui_input(Ref<InputEvent> p_event);
bool _set(const StringName &p_name, const Variant &p_value); bool _set(const StringName &p_name, const Variant &p_value);
bool _get(const StringName &p_name, Variant &r_ret) const; bool _get(const StringName &p_name, Variant &r_ret) const;
void _get_property_list(List<PropertyInfo> *p_list) const; void _get_property_list(List<PropertyInfo> *p_list) const;
void _validate_property(PropertyInfo &property) const override;
public: public:
void set_align(Align p_align); void set_align(Align p_align);

View file

@ -3634,6 +3634,7 @@ void RichTextLabel::set_use_bbcode(bool p_enable) {
} }
use_bbcode = p_enable; use_bbcode = p_enable;
set_bbcode(bbcode); set_bbcode(bbcode);
notify_property_list_changed();
} }
bool RichTextLabel::is_using_bbcode() const { bool RichTextLabel::is_using_bbcode() const {
@ -3771,6 +3772,12 @@ int RichTextLabel::get_content_height() const {
return total_height; return total_height;
} }
void RichTextLabel::_validate_property(PropertyInfo &property) const {
if (!use_bbcode && property.name == "bbcode_text") {
property.usage = PROPERTY_USAGE_NOEDITOR;
}
}
void RichTextLabel::_bind_methods() { void RichTextLabel::_bind_methods() {
ClassDB::bind_method(D_METHOD("_gui_input"), &RichTextLabel::_gui_input); ClassDB::bind_method(D_METHOD("_gui_input"), &RichTextLabel::_gui_input);
ClassDB::bind_method(D_METHOD("get_text"), &RichTextLabel::get_text); ClassDB::bind_method(D_METHOD("get_text"), &RichTextLabel::get_text);

View file

@ -81,7 +81,9 @@ public:
}; };
protected: protected:
void _notification(int p_what);
static void _bind_methods(); static void _bind_methods();
void _validate_property(PropertyInfo &property) const override;
private: private:
struct Item; struct Item;
@ -441,9 +443,6 @@ private:
bool fit_content_height = false; bool fit_content_height = false;
protected:
void _notification(int p_what);
public: public:
String get_text(); String get_text();
void add_text(const String &p_text); void add_text(const String &p_text);

View file

@ -258,13 +258,11 @@ void CanvasLayer::_update_follow_viewport(bool p_force_exit) {
} }
} }
#ifdef TOOLS_ENABLED
void CanvasLayer::_validate_property(PropertyInfo &property) const { void CanvasLayer::_validate_property(PropertyInfo &property) const {
if (!follow_viewport && property.name == "follow_viewport_scale") { if (!follow_viewport && property.name == "follow_viewport_scale") {
property.usage = PROPERTY_USAGE_NOEDITOR; property.usage = PROPERTY_USAGE_NOEDITOR;
} }
} }
#endif
void CanvasLayer::_bind_methods() { void CanvasLayer::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_layer", "layer"), &CanvasLayer::set_layer); ClassDB::bind_method(D_METHOD("set_layer", "layer"), &CanvasLayer::set_layer);

View file

@ -61,13 +61,10 @@ class CanvasLayer : public Node {
void _update_locrotscale(); void _update_locrotscale();
void _update_follow_viewport(bool p_force_exit = false); void _update_follow_viewport(bool p_force_exit = false);
#ifdef TOOLS_ENABLED
void _validate_property(PropertyInfo &property) const override;
#endif
protected: protected:
void _notification(int p_what); void _notification(int p_what);
static void _bind_methods(); static void _bind_methods();
void _validate_property(PropertyInfo &property) const override;
public: public:
void set_layer(int p_xform); void set_layer(int p_xform);

View file

@ -145,7 +145,6 @@ void CameraEffects::_update_override_exposure() {
// Private methods, constructor and destructor // Private methods, constructor and destructor
#ifdef TOOLS_ENABLED
void CameraEffects::_validate_property(PropertyInfo &property) const { void CameraEffects::_validate_property(PropertyInfo &property) const {
if ((!dof_blur_far_enabled && (property.name == "dof_blur_far_distance" || property.name == "dof_blur_far_transition")) || if ((!dof_blur_far_enabled && (property.name == "dof_blur_far_distance" || property.name == "dof_blur_far_transition")) ||
(!dof_blur_near_enabled && (property.name == "dof_blur_near_distance" || property.name == "dof_blur_near_transition")) || (!dof_blur_near_enabled && (property.name == "dof_blur_near_distance" || property.name == "dof_blur_near_transition")) ||
@ -153,7 +152,6 @@ void CameraEffects::_validate_property(PropertyInfo &property) const {
property.usage = PROPERTY_USAGE_NOEDITOR; property.usage = PROPERTY_USAGE_NOEDITOR;
} }
} }
#endif
void CameraEffects::_bind_methods() { void CameraEffects::_bind_methods() {
// DOF blur // DOF blur

View file

@ -57,12 +57,9 @@ private:
float override_exposure = 1.0; float override_exposure = 1.0;
void _update_override_exposure(); void _update_override_exposure();
#ifdef TOOLS_ENABLED
void _validate_property(PropertyInfo &property) const override;
#endif
protected: protected:
static void _bind_methods(); static void _bind_methods();
void _validate_property(PropertyInfo &property) const override;
public: public:
virtual RID get_rid() const override; virtual RID get_rid() const override;

View file

@ -460,6 +460,7 @@ Point2 StyleBoxFlat::get_shadow_offset() const {
void StyleBoxFlat::set_anti_aliased(const bool &p_anti_aliased) { void StyleBoxFlat::set_anti_aliased(const bool &p_anti_aliased) {
anti_aliased = p_anti_aliased; anti_aliased = p_anti_aliased;
emit_changed(); emit_changed();
notify_property_list_changed();
} }
bool StyleBoxFlat::is_anti_aliased() const { bool StyleBoxFlat::is_anti_aliased() const {
@ -781,6 +782,12 @@ float StyleBoxFlat::get_style_margin(Side p_side) const {
return border_width[p_side]; return border_width[p_side];
} }
void StyleBoxFlat::_validate_property(PropertyInfo &property) const {
if (!anti_aliased && property.name == "anti_aliasing_size") {
property.usage = PROPERTY_USAGE_NOEDITOR;
}
}
void StyleBoxFlat::_bind_methods() { void StyleBoxFlat::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_bg_color", "color"), &StyleBoxFlat::set_bg_color); ClassDB::bind_method(D_METHOD("set_bg_color", "color"), &StyleBoxFlat::set_bg_color);
ClassDB::bind_method(D_METHOD("get_bg_color"), &StyleBoxFlat::get_bg_color); ClassDB::bind_method(D_METHOD("get_bg_color"), &StyleBoxFlat::get_bg_color);

View file

@ -159,6 +159,7 @@ class StyleBoxFlat : public StyleBox {
protected: protected:
virtual float get_style_margin(Side p_side) const override; virtual float get_style_margin(Side p_side) const override;
static void _bind_methods(); static void _bind_methods();
void _validate_property(PropertyInfo &property) const override;
public: public:
//Color //Color