Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-01-28 07:03:00 +08:00
Code Issues Projects Releases Wiki Activity

Consolidating identical LV_KEY_RIGHT/UP and LV_KEY_LEFT/DOWN code

Browse Source
This commit is contained in:
Paul Peavyhouse 2019-09-29 21:00:00 -07:00
parent 3a5293fa32
commit bf9ed06bac
1 changed files with 2 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/lv_objx/lv_cpicker.c
View File

@ -1200,7 +1200,7 @@ static lv_res_t lv_cpicker_signal(lv_obj_t * cpicker, lv_signal_t sign, void * p
if(sign == LV_SIGNAL_CONTROL) {
uint32_t c = *((uint32_t *)param); /*uint32_t because can be UTF-8*/
if(c == LV_KEY_RIGHT)
if(c == LV_KEY_RIGHT || c == LV_KEY_UP)
{
switch(ext->color_mode)
{
@ -1220,47 +1220,7 @@ static lv_res_t lv_cpicker_signal(lv_obj_t * cpicker, lv_signal_t sign, void * p
res = lv_event_send(cpicker, LV_EVENT_VALUE_CHANGED, NULL);
if(res != LV_RES_OK) return res;
}
else if(c == LV_KEY_LEFT)
{
switch(ext->color_mode)
{
case LV_CPICKER_COLOR_MODE_HUE:
ext->hsv.h = ext->hsv.h > 0?(ext->hsv.h - 1):360;
break;
case LV_CPICKER_COLOR_MODE_SATURATION:
ext->hsv.s = ext->hsv.s > 0?(ext->hsv.s - 1):100;
break;
case LV_CPICKER_COLOR_MODE_VALUE:
ext->hsv.v = ext->hsv.v > 0?(ext->hsv.v - 1):100;
break;
}
lv_cpicker_invalidate(cpicker, false);
res = lv_event_send(cpicker, LV_EVENT_VALUE_CHANGED, NULL);
if(res != LV_RES_OK) return res;
}
else if(c == LV_KEY_UP)
{
switch(ext->color_mode)
{
case LV_CPICKER_COLOR_MODE_HUE:
ext->hsv.h = (ext->hsv.h + 1) % 360;
break;
case LV_CPICKER_COLOR_MODE_SATURATION:
ext->hsv.s = (ext->hsv.s + 1) % 100;
break;
case LV_CPICKER_COLOR_MODE_VALUE:
ext->hsv.v = (ext->hsv.v + 1) % 100;
break;
}
lv_cpicker_invalidate(cpicker, false);
res = lv_event_send(cpicker, LV_EVENT_VALUE_CHANGED, NULL);
if(res != LV_RES_OK) return res;
}
else if(c == LV_KEY_DOWN)
else if(c == LV_KEY_LEFT || c == LV_KEY_DOWN)
{
switch(ext->color_mode)
{