godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Fix Range property dependencies

Browse Source
This commit is contained in:
kobewi
2021-10-09 17:31:29 +02:00
parent df376750ce
commit 81c0fe836c
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
scene/gui/range.cpp
View File

@@ -61,6 +61,11 @@ void Range::_changed_notify(const char *p_what) {
update(); update();
} }
void Range::_validate_values() {
shared->max = MAX(shared->max, shared->min);
shared->page = CLAMP(shared->page, 0, shared->max - shared->min);
}
void Range::Shared::emit_changed(const char *p_what) { void Range::Shared::emit_changed(const char *p_what) {
for (Set<Range *>::Element *E = owners.front(); E; E = E->next()) { for (Set<Range *>::Element *E = owners.front(); E; E = E->next()) {
Range *r = E->get(); Range *r = E->get();
@@ -100,6 +105,7 @@ void Range::set_value(double p_val) {
void Range::set_min(double p_min) { void Range::set_min(double p_min) {
shared->min = p_min; shared->min = p_min;
set_value(shared->val); set_value(shared->val);
_validate_values();
shared->emit_changed("min"); shared->emit_changed("min");
@@ -109,6 +115,7 @@ void Range::set_min(double p_min) {
void Range::set_max(double p_max) { void Range::set_max(double p_max) {
shared->max = p_max; shared->max = p_max;
set_value(shared->val); set_value(shared->val);
_validate_values();
shared->emit_changed("max"); shared->emit_changed("max");
} }
@@ -121,6 +128,7 @@ void Range::set_step(double p_step) {
void Range::set_page(double p_page) { void Range::set_page(double p_page) {
shared->page = p_page; shared->page = p_page;
set_value(shared->val); set_value(shared->val);
_validate_values();
shared->emit_changed("page"); shared->emit_changed("page");
} }
@@ -270,6 +278,12 @@ void Range::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "rounded"), "set_use_rounded_values", "is_using_rounded_values"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "rounded"), "set_use_rounded_values", "is_using_rounded_values");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "allow_greater"), "set_allow_greater", "is_greater_allowed"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "allow_greater"), "set_allow_greater", "is_greater_allowed");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "allow_lesser"), "set_allow_lesser", "is_lesser_allowed"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "allow_lesser"), "set_allow_lesser", "is_lesser_allowed");
ADD_LINKED_PROPERTY("min_value", "value");
ADD_LINKED_PROPERTY("min_value", "max_value");
ADD_LINKED_PROPERTY("min_value", "page");
ADD_LINKED_PROPERTY("max_value", "value");
ADD_LINKED_PROPERTY("max_value", "page");
} }
void Range::set_use_rounded_values(bool p_enable) { void Range::set_use_rounded_values(bool p_enable) {

1
scene/gui/range.h
View File

@@ -59,6 +59,7 @@ class Range : public Control {
void _value_changed_notify(); void _value_changed_notify();
void _changed_notify(const char *p_what = ""); void _changed_notify(const char *p_what = "");
void _validate_values();
protected: protected:
virtual void _value_changed(double) {} virtual void _value_changed(double) {}