GVarNumberEdit: fix editing GVAR
NumberEdit would cap and set the value based on its own limits (-500;500). This is not possible anymore as the "setValue" method is now set when NumberEdit is visible and really used.
This commit is contained in:
@@ -67,8 +67,7 @@ GVarNumberEdit::GVarNumberEdit(Window* parent, const rect_t& rect, int32_t vmin,
|
|||||||
|
|
||||||
num_field = new NumberEdit(
|
num_field = new NumberEdit(
|
||||||
this, rect_t{}, vmin, vmax, [=]() { return getValue() + voffset; },
|
this, rect_t{}, vmin, vmax, [=]() { return getValue() + voffset; },
|
||||||
[=](int32_t newValue) { return setValue(newValue - voffset); },
|
nullptr, windowFlags, textFlags);
|
||||||
windowFlags, textFlags);
|
|
||||||
|
|
||||||
#if defined(GVARS)
|
#if defined(GVARS)
|
||||||
// The GVAR button
|
// The GVAR button
|
||||||
@@ -130,13 +129,16 @@ void GVarNumberEdit::update()
|
|||||||
if (GV_IS_GV_VALUE(value, vmin, vmax)) {
|
if (GV_IS_GV_VALUE(value, vmin, vmax)) {
|
||||||
// GVAR mode
|
// GVAR mode
|
||||||
act_field = gvar_field;
|
act_field = gvar_field;
|
||||||
|
num_field->setSetValueHandler(nullptr);
|
||||||
lv_obj_clear_flag(gvar_obj, LV_OBJ_FLAG_HIDDEN);
|
lv_obj_clear_flag(gvar_obj, LV_OBJ_FLAG_HIDDEN);
|
||||||
lv_event_send(gvar_obj, LV_EVENT_VALUE_CHANGED, nullptr);
|
lv_event_send(gvar_obj, LV_EVENT_VALUE_CHANGED, nullptr);
|
||||||
} else {
|
} else {
|
||||||
// number edit mode
|
// number edit mode
|
||||||
act_field = num_field;
|
act_field = num_field;
|
||||||
lv_obj_clear_flag(num_obj, LV_OBJ_FLAG_HIDDEN);
|
num_field->setSetValueHandler(
|
||||||
|
[=](int32_t newValue) { return setValue(newValue - voffset); });
|
||||||
num_field->setValue(value + voffset);
|
num_field->setValue(value + voffset);
|
||||||
|
lv_obj_clear_flag(num_obj, LV_OBJ_FLAG_HIDDEN);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (has_focus) {
|
if (has_focus) {
|
||||||
|
|||||||
Reference in New Issue
Block a user