Filed: Fixed remembering of the last meaningful value for nullable parameters
+ For "idle_temperature" set default value to 30
This commit is contained in:
parent
dc1579df04
commit
d7adef1eff
@ -598,6 +598,10 @@ bool TextCtrl::value_was_changed()
|
|||||||
|
|
||||||
void TextCtrl::propagate_value()
|
void TextCtrl::propagate_value()
|
||||||
{
|
{
|
||||||
|
wxString val = dynamic_cast<wxTextCtrl*>(window)->GetValue();
|
||||||
|
if (m_opt.nullable && val != na_value())
|
||||||
|
m_last_meaningful_value = val;
|
||||||
|
|
||||||
if (!is_defined_input_value<wxTextCtrl>(window, m_opt.type) )
|
if (!is_defined_input_value<wxTextCtrl>(window, m_opt.type) )
|
||||||
// on_kill_focus() cause a call of OptionsGroup::reload_config(),
|
// on_kill_focus() cause a call of OptionsGroup::reload_config(),
|
||||||
// Thus, do it only when it's really needed (when undefined value was input)
|
// Thus, do it only when it's really needed (when undefined value was input)
|
||||||
@ -778,8 +782,12 @@ void SpinCtrl::BUILD() {
|
|||||||
case coInts:
|
case coInts:
|
||||||
{
|
{
|
||||||
default_value = m_opt.get_default_value<ConfigOptionInts>()->get_at(m_opt_idx);
|
default_value = m_opt.get_default_value<ConfigOptionInts>()->get_at(m_opt_idx);
|
||||||
if (m_opt.nullable)
|
if (m_opt.nullable) {
|
||||||
m_last_meaningful_value = default_value == ConfigOptionIntsNullable::nil_value() ? static_cast<int>(m_opt.max) : default_value;
|
if (default_value == ConfigOptionIntsNullable::nil_value())
|
||||||
|
m_last_meaningful_value = m_opt.opt_key == "idle_temperature" ? 30 : static_cast<int>(m_opt.max);
|
||||||
|
else
|
||||||
|
m_last_meaningful_value = default_value;
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
@ -937,6 +945,9 @@ void SpinCtrl::propagate_value()
|
|||||||
if (boost::any_cast<int>(m_value) == tmp_value)
|
if (boost::any_cast<int>(m_value) == tmp_value)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
if (m_opt.nullable && tmp_value != ConfigOptionIntsNullable::nil_value())
|
||||||
|
m_last_meaningful_value = tmp_value;
|
||||||
|
|
||||||
if (tmp_value == UNDEF_VALUE) {
|
if (tmp_value == UNDEF_VALUE) {
|
||||||
on_kill_focus();
|
on_kill_focus();
|
||||||
} else {
|
} else {
|
||||||
|
Loading…
Reference in New Issue
Block a user