github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lv_spinbox: fixes

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2019-02-12 07:55:46 +01:00
parent 6f47dd6522
commit caa2064c90
1 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lv_objx/lv_spinbox.c
View File

@@ -67,16 +67,15 @@ lv_obj_t * lv_spinbox_create(lv_obj_t * par, const lv_obj_t * copy)
ext->ta.accapted_chars = "1234567890+-."; ext->ta.accapted_chars = "1234567890+-.";
ext->value = 0; ext->value = 0;
ext->dec_point_pos = 2; ext->dec_point_pos = 0;
ext->digit_count = 5; ext->digit_count = 5;
ext->step = 100; ext->digit_padding_left = 0;
ext->step = 1;
ext->range_max = 99999; ext->range_max = 99999;
ext->range_min = -99999; ext->range_min = -99999;
ext->value_changed_cb = NULL; ext->value_changed_cb = NULL;
lv_ta_set_cursor_type(new_spinbox, LV_CURSOR_BLOCK | LV_CURSOR_HIDDEN); /*hidden by default*/ lv_ta_set_cursor_type(new_spinbox, LV_CURSOR_BLOCK | LV_CURSOR_HIDDEN); /*hidden by default*/
lv_ta_set_cursor_pos(new_spinbox, 4);
/*The signal and design functions are not copied so set them here*/ /*The signal and design functions are not copied so set them here*/
lv_obj_set_signal_func(new_spinbox, lv_spinbox_signal); lv_obj_set_signal_func(new_spinbox, lv_spinbox_signal);
@@ -450,8 +449,8 @@ static void lv_spinbox_updatevalue(lv_obj_t * spinbox)
int i = 0; int i = 0;
uint8_t digits[16]; uint8_t digits[16];
if(v < 0) if(v < 0) v = -v;
v = -v;
for(i = 0; i < dc; i++) for(i = 0; i < dc; i++)
{ {
digits[i] = v%10; digits[i] = v%10;
@@ -464,18 +463,24 @@ static void lv_spinbox_updatevalue(lv_obj_t * spinbox)
ext->digits[1 + pl + k] = '0' + digits[--i]; ext->digits[1 + pl + k] = '0' + digits[--i];
} }
ext->digits[1 + pl + intDigits] = '.'; if(ext->dec_point_pos != 0) {
ext->digits[1 + pl + intDigits] = '.';
int d; int d;
for(d = 0; d < decDigits; d++)
{
ext->digits[1 + pl + intDigits + 1 + d] = '0' + digits[--i];
}
ext->digits[1 + pl + intDigits + 1 + decDigits] = '\0';
} else {
ext->digits[1 + pl + intDigits] = '\0';
for(d = 0; d < decDigits; d++)
{
ext->digits[1 + pl + intDigits + 1 + d] = '0' + digits[--i];
} }
ext->digits[1 + pl + intDigits + 1 + decDigits] = '\0';
lv_label_set_text(ext->ta.label, (char*)ext->digits); lv_ta_set_text(spinbox, (char*)ext->digits);
int32_t step = ext->step; int32_t step = ext->step;
uint8_t cPos = ext->digit_count + pl; uint8_t cPos = ext->digit_count + pl;