diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2018-09-28 10:53:24 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-28 10:53:24 +0200 |
commit | 28c683721948bcbb58c4caa0d8aefa82f2b18a88 (patch) | |
tree | da786613d58d1b4559d32f8dad6ed81593621e81 | |
parent | d55491a7b8093bfadd257bd9df6a04f76e05d8ca (diff) | |
parent | e78bfe19a7bb4cad7609eb6e343585d06c0731b4 (diff) |
Merge pull request #22381 from DualMatrix/range_exp_warning
Added warning when min_value of range <= 0 while exp_edit is true.
-rw-r--r-- | scene/gui/range.cpp | 17 | ||||
-rw-r--r-- | scene/gui/range.h | 2 |
2 files changed, 19 insertions, 0 deletions
diff --git a/scene/gui/range.cpp b/scene/gui/range.cpp index 8fe33a00fb..e862743934 100644 --- a/scene/gui/range.cpp +++ b/scene/gui/range.cpp @@ -30,6 +30,19 @@ #include "range.h" +String Range::get_configuration_warning() const { + String warning = Control::get_configuration_warning(); + + if (shared->exp_ratio && shared->min <= 0) { + if (warning != String()) { + warning += "\n"; + } + warning += TTR("If exp_edit is true min_value must be > 0."); + } + + return warning; +} + void Range::_value_changed_notify() { _value_changed(shared->val); @@ -91,6 +104,8 @@ void Range::set_min(double p_min) { set_value(shared->val); shared->emit_changed("min"); + + update_configuration_warning(); } void Range::set_max(double p_max) { @@ -278,6 +293,8 @@ bool Range::is_using_rounded_values() const { void Range::set_exp_ratio(bool p_enable) { shared->exp_ratio = p_enable; + + update_configuration_warning(); } bool Range::is_ratio_exp() const { diff --git a/scene/gui/range.h b/scene/gui/range.h index 125f559248..58f15c8aa8 100644 --- a/scene/gui/range.h +++ b/scene/gui/range.h @@ -97,6 +97,8 @@ public: void share(Range *p_range); void unshare(); + virtual String get_configuration_warning() const; + Range(); ~Range(); }; |