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

apply new padding in some themes

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi 2019-03-15 05:10:43 +01:00
parent a0b6136dcf
commit c3156db6b9
6 changed files with 100 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lv_core/lv_indev.c
View File

@ -398,6 +398,9 @@ static void indev_keypad_proc(lv_indev_t * i, lv_indev_data_t * data)
if(i->proc.reset_query) return; /*The object might be deleted*/
lv_obj_send_event(focused, LV_EVENT_PRESSED);
if(i->proc.reset_query) return; /*The object might be deleted*/
/*Send the ENTER as a normal KEY*/
lv_group_send_data(g, LV_GROUP_KEY_ENTER);
}
/*Move the focus on NEXT*/
else if(data->key == LV_GROUP_KEY_NEXT) {

8
lv_objx/lv_btnm.c
View File

@ -851,6 +851,7 @@ static lv_res_t lv_btnm_signal(lv_obj_t * btnm, lv_signal_t sign, void * param)
}
ext->btn_id_pr = btn_pr;
ext->btn_id_act = btn_pr;
}
else if(sign == LV_SIGNAL_RELEASED) {
if(ext->btn_id_pr != LV_BTNM_BTN_NONE) {
@ -863,6 +864,9 @@ static lv_res_t lv_btnm_signal(lv_obj_t * btnm, lv_signal_t sign, void * param)
}
}
/*Invalidate to old pressed area*/;
invalidate_button_area(btnm, ext->btn_id_pr);
#if LV_USE_GROUP
/*Leave the clicked button when releases if this not the focused object in a group*/
lv_group_t * g = lv_obj_get_group(btnm);
@ -873,10 +877,6 @@ static lv_res_t lv_btnm_signal(lv_obj_t * btnm, lv_signal_t sign, void * param)
ext->btn_id_pr = LV_BTNM_BTN_NONE;
#endif
}
/*Invalidate to old pressed area*/;
invalidate_button_area(btnm, ext->btn_id_pr);
}
else if(sign == LV_SIGNAL_PRESS_LOST || sign == LV_SIGNAL_DEFOCUS) {
ext->btn_id_pr = LV_BTNM_BTN_NONE;

1
lv_objx/lv_list.c
View File

@ -178,7 +178,6 @@ void lv_list_clean(lv_obj_t * obj)
*/
lv_obj_t * lv_list_add(lv_obj_t * list, const void * img_src, const char * txt, lv_event_cb_t event_cb)
{
lv_style_t * style = lv_obj_get_style(list);
lv_list_ext_t * ext = lv_obj_get_ext_attr(list);
ext->size ++;
/*Create a list element with the image an the text*/

2
lv_objx/lv_page.c
View File

@ -1124,7 +1124,7 @@ static void lv_page_sb_refresh(lv_obj_t * page)
lv_area_set_pos(&ext->sb.ver_area, obj_w - ext->sb.style->body.padding.inner - ext->sb.style->body.padding.bottom,
sb_ver_pad +
(-(lv_obj_get_y(scrl) - ext->sb.style->body.padding.bottom) * (obj_h - size_tmp - 2 * sb_ver_pad)) /
(scrl_h + style->body.padding.top + ext->sb.style->body.padding.bottom - obj_h));
(scrl_h + style->body.padding.top + style->body.padding.bottom - obj_h));
if(ext->sb.mode == LV_SB_MODE_AUTO || ext->sb.mode == LV_SB_MODE_DRAG) ext->sb.ver_draw = 1;
}

35
lv_themes/lv_theme_mono.c
View File

@ -54,8 +54,10 @@ static void basic_init(void)
def.body.grad_color = LV_COLOR_WHITE;
def.body.radius = 0;
def.body.opa = LV_OPA_COVER;
def.body.padding.hor = LV_DPI / 10;
def.body.padding.ver = LV_DPI / 10;
def.body.padding.left = LV_DPI / 10;
def.body.padding.right = LV_DPI / 10;
def.body.padding.top = LV_DPI / 10;
def.body.padding.bottom = LV_DPI / 10;
def.body.padding.inner = LV_DPI / 10;
def.body.border.color = LV_COLOR_BLACK;
def.body.border.width = 1;
@ -168,13 +170,17 @@ static void bar_init(void)
static lv_style_t bar_indic;
lv_style_copy(&bar_bg, &light_frame);
bar_bg.body.padding.hor = LV_DPI / 15;
bar_bg.body.padding.ver = LV_DPI / 15;
bar_bg.body.padding.left = LV_DPI / 15;
bar_bg.body.padding.right = LV_DPI / 15;
bar_bg.body.padding.top = LV_DPI / 15;
bar_bg.body.padding.bottom = LV_DPI / 15;
bar_bg.body.radius = LV_RADIUS_CIRCLE;
lv_style_copy(&bar_indic, &dark_frame);
bar_indic.body.padding.hor = LV_DPI / 30;
bar_indic.body.padding.ver = LV_DPI / 30;
bar_indic.body.padding.left = LV_DPI / 30;
bar_indic.body.padding.right = LV_DPI / 30;
bar_indic.body.padding.top = LV_DPI / 30;
bar_indic.body.padding.bottom = LV_DPI / 30;
bar_indic.body.radius = LV_RADIUS_CIRCLE;
theme.style.bar.bg = &bar_bg;
@ -188,8 +194,10 @@ static void slider_init(void)
static lv_style_t slider_knob;
lv_style_copy(&slider_knob, &light_frame);
slider_knob.body.radius = LV_RADIUS_CIRCLE;
slider_knob.body.padding.hor = LV_DPI / 30;
slider_knob.body.padding.ver = LV_DPI / 30;
slider_knob.body.padding.left = LV_DPI / 30;
slider_knob.body.padding.right = LV_DPI / 30;
slider_knob.body.padding.top = LV_DPI / 30;
slider_knob.body.padding.bottom = LV_DPI / 30;
theme.style.slider.bg = theme.style.bar.bg;
theme.style.slider.indic = theme.style.bar.indic;
@ -218,7 +226,7 @@ static void lmeter_init(void)
lmeter_bg.body.opa = LV_OPA_TRANSP;
lmeter_bg.body.main_color = LV_COLOR_BLACK;
lmeter_bg.body.grad_color = LV_COLOR_BLACK;
lmeter_bg.body.padding.hor = LV_DPI / 20;
lmeter_bg.body.padding.left = LV_DPI / 20;
lmeter_bg.body.padding.inner = LV_DPI / 8;
lmeter_bg.line.color = LV_COLOR_WHITE;
lmeter_bg.line.width = 1;
@ -252,7 +260,8 @@ static void calendar_init(void)
#if LV_USE_CALENDAR
static lv_style_t box;
lv_style_copy(&box, &light_plain);
box.body.padding.ver = LV_DPI / 20;
box.body.padding.top = LV_DPI / 20;
box.body.padding.bottom = LV_DPI / 20;
/*Can't handle highlighted dates in this theme*/
theme.style.calendar.week_box = &box;
@ -399,8 +408,10 @@ static void win_init(void)
#if LV_USE_WIN != 0
static lv_style_t win_header;
lv_style_copy(&win_header, &dark_plain);
win_header.body.padding.hor = LV_DPI / 30;
win_header.body.padding.ver = LV_DPI / 30;
win_header.body.padding.left = LV_DPI / 30;
win_header.body.padding.right = LV_DPI / 30;
win_header.body.padding.top = LV_DPI / 30;
win_header.body.padding.bottom = LV_DPI / 30;
theme.style.win.bg = &light_frame;
theme.style.win.sb = &dark_frame;

106
lv_themes/lv_theme_night.c
View File

@ -66,8 +66,10 @@ static void basic_init(void)
sb.body.grad_color = lv_color_hsv_to_rgb(_hue, 30, 60);
sb.body.border.width = 0;
sb.body.padding.inner = LV_DPI / 10;
sb.body.padding.ver = 0;
sb.body.padding.hor = 0;
sb.body.padding.left = 0;
sb.body.padding.right = 0;
sb.body.padding.top = 0;
sb.body.padding.bottom = 0;
sb.body.radius = LV_DPI / 30;
sb.body.opa = LV_OPA_COVER;
@ -78,8 +80,10 @@ static void basic_init(void)
panel.body.border.color = lv_color_hsv_to_rgb(_hue, 10, 25);
panel.body.border.width = 1;
panel.body.border.opa = LV_OPA_COVER;
panel.body.padding.ver = LV_DPI / 10;
panel.body.padding.hor = LV_DPI / 10;
panel.body.padding.left = LV_DPI / 10;
panel.body.padding.right = LV_DPI / 10;
panel.body.padding.top = LV_DPI / 10;
panel.body.padding.bottom = LV_DPI / 10;
panel.line.color = lv_color_hsv_to_rgb(_hue, 20, 40);
panel.line.width = 1;
theme.style.bg = &bg;
@ -104,8 +108,10 @@ static void btn_init(void)
btn_rel.body.border.color = LV_COLOR_HEX3(0x111);
btn_rel.body.border.width = 1;
btn_rel.body.border.opa = LV_OPA_70;
btn_rel.body.padding.hor = LV_DPI / 4;
btn_rel.body.padding.ver = LV_DPI / 8;
btn_rel.body.padding.left = LV_DPI / 4;
btn_rel.body.padding.right = LV_DPI / 4;
btn_rel.body.padding.top = LV_DPI / 8;
btn_rel.body.padding.bottom = LV_DPI / 8;
btn_rel.body.shadow.type = LV_SHADOW_BOTTOM;
btn_rel.body.shadow.color = LV_COLOR_HEX3(0x111);
btn_rel.body.shadow.width = LV_DPI / 30;
@ -206,8 +212,10 @@ static void bar_init(void)
{
#if LV_USE_BAR
lv_style_copy(&bar_bg, &panel);
bar_bg.body.padding.ver = LV_DPI / 16;
bar_bg.body.padding.hor = LV_DPI / 16;
bar_bg.body.padding.left = LV_DPI / 16;
bar_bg.body.padding.right = LV_DPI / 16;
bar_bg.body.padding.top = LV_DPI / 16;
bar_bg.body.padding.bottom = LV_DPI / 16;
bar_bg.body.radius = LV_RADIUS_CIRCLE;
lv_style_copy(&bar_indic, &def);
@ -217,8 +225,10 @@ static void bar_init(void)
bar_indic.body.border.width = 1;
bar_indic.body.border.opa = LV_OPA_COVER;
bar_indic.body.radius = LV_RADIUS_CIRCLE;
bar_indic.body.padding.hor = 0;
bar_indic.body.padding.ver = 0;
bar_indic.body.padding.left = 0;
bar_indic.body.padding.right = 0;
bar_indic.body.padding.top = 0;
bar_indic.body.padding.bottom = 0;
theme.style.bar.bg = &bar_bg;
theme.style.bar.indic = &bar_indic;
@ -257,7 +267,7 @@ static void lmeter_init(void)
lv_style_copy(&lmeter_bg, &def);
lmeter_bg.body.main_color = lv_color_hsv_to_rgb(_hue, 10, 70);
lmeter_bg.body.grad_color = lv_color_hsv_to_rgb(_hue, 95, 90);
lmeter_bg.body.padding.hor = LV_DPI / 10; /*Scale line length*/
lmeter_bg.body.padding.left = LV_DPI / 10; /*Scale line length*/
lmeter_bg.body.padding.inner = LV_DPI / 10; /*Text padding*/
lmeter_bg.body.border.color = LV_COLOR_HEX3(0x333);
lmeter_bg.line.color = LV_COLOR_HEX3(0x555);
@ -296,8 +306,10 @@ static void arc_init(void)
/*For preloader*/
arc.body.border.width = 7;
arc.body.border.color = lv_color_hsv_to_rgb(_hue, 11, 48);
arc.body.padding.hor = 1;
arc.body.padding.ver = 1;
arc.body.padding.left = 1;
arc.body.padding.right = 1;
arc.body.padding.top = 1;
arc.body.padding.bottom = 1;
theme.style.arc = &arc;
#endif
@ -328,8 +340,10 @@ static void calendar_init(void)
cal_bg.body.border.color = LV_COLOR_HEX3(0x333);
cal_bg.body.border.width = 1;
cal_bg.body.radius = LV_DPI / 20;
cal_bg.body.padding.hor = LV_DPI / 10;
cal_bg.body.padding.ver = LV_DPI / 10;
cal_bg.body.padding.left = LV_DPI / 10;
cal_bg.body.padding.right = LV_DPI / 10;
cal_bg.body.padding.top = LV_DPI / 10;
cal_bg.body.padding.bottom = LV_DPI / 10;
static lv_style_t cal_header;
lv_style_copy(&cal_header, &bg);
@ -338,8 +352,10 @@ static void calendar_init(void)
cal_header.body.radius = 0;
cal_header.body.border.width = 1;
cal_header.body.border.color = LV_COLOR_HEX3(0x333);
cal_header.body.padding.hor = LV_DPI / 10;
cal_header.body.padding.ver = LV_DPI / 10;
cal_header.body.padding.left = LV_DPI / 10;
cal_header.body.padding.right = LV_DPI / 10;
cal_header.body.padding.top = LV_DPI / 10;
cal_header.body.padding.bottom = LV_DPI / 10;
static lv_style_t week_box;
lv_style_copy(&week_box, &panel);
@ -347,16 +363,20 @@ static void calendar_init(void)
week_box.body.grad_color = lv_color_hsv_to_rgb(_hue, 30, 45);
week_box.body.radius = LV_DPI / 20;
week_box.body.border.width = 1;
week_box.body.padding.hor = LV_DPI / 20;
week_box.body.padding.ver = LV_DPI / 25;
week_box.body.padding.left = LV_DPI / 20;
week_box.body.padding.right = LV_DPI / 20;
week_box.body.padding.top = LV_DPI / 25;
week_box.body.padding.bottom = LV_DPI / 25;
static lv_style_t today_box;
lv_style_copy(&today_box, &week_box);
today_box.body.main_color = lv_color_hsv_to_rgb(_hue, 80, 70);
today_box.body.grad_color = lv_color_hsv_to_rgb(_hue, 80, 70);
today_box.body.radius = LV_DPI / 20;
today_box.body.padding.hor = LV_DPI / 14;
today_box.body.padding.ver = LV_DPI / 14;
today_box.body.padding.left = LV_DPI / 14;
today_box.body.padding.right = LV_DPI / 14;
today_box.body.padding.top = LV_DPI / 14;
today_box.body.padding.bottom = LV_DPI / 14;
static lv_style_t highlighted_days;
lv_style_copy(&highlighted_days, &bg);
@ -406,7 +426,6 @@ static void cb_init(void)
tgl_pr.body.border.color = lv_color_hsv_to_rgb(_hue, 80, 30);
tgl_pr.body.border.width = 1;;
lv_style_copy(&ina, &rel);
ina.body.main_color = LV_COLOR_HEX3(0x777);
ina.body.grad_color = LV_COLOR_HEX3(0x777);
@ -428,8 +447,10 @@ static void btnm_init(void)
static lv_style_t btnm_bg, rel, pr, tgl_rel, tgl_pr, ina;
lv_style_copy(&btnm_bg, &btn_rel);
btnm_bg.body.padding.hor = 2;
btnm_bg.body.padding.ver = 2;
btnm_bg.body.padding.left = 2;
btnm_bg.body.padding.right = 2;
btnm_bg.body.padding.top = 2;
btnm_bg.body.padding.bottom = 2;
btnm_bg.body.padding.inner = 0;
btnm_bg.body.border.width = 1;
@ -542,8 +563,10 @@ static void list_init(void)
static lv_style_t list_bg, list_btn_rel, list_btn_pr, list_btn_tgl_rel, list_btn_tgl_pr;
lv_style_copy(&list_bg, &panel);
list_bg.body.padding.ver = 0;
list_bg.body.padding.hor = 0;
list_bg.body.padding.top = 0;
list_bg.body.padding.bottom = 0;
list_bg.body.padding.left = 0;
list_bg.body.padding.right = 0;
list_bg.body.padding.inner = 0;
lv_style_copy(&list_btn_rel, &bg);
@ -554,16 +577,20 @@ static void list_init(void)
list_btn_rel.body.radius = LV_DPI / 10;
list_btn_rel.text.color = lv_color_hsv_to_rgb(_hue, 5, 80);
list_btn_rel.image.color = lv_color_hsv_to_rgb(_hue, 5, 80);
list_btn_rel.body.padding.ver = LV_DPI / 6;
list_btn_rel.body.padding.hor = LV_DPI / 8;
list_btn_rel.body.padding.top = LV_DPI / 6;
list_btn_rel.body.padding.bottom = LV_DPI / 6;
list_btn_rel.body.padding.left = LV_DPI / 8;
list_btn_rel.body.padding.right = LV_DPI / 8;
lv_style_copy(&list_btn_pr, &btn_pr);
list_btn_pr.body.main_color = btn_pr.body.grad_color;
list_btn_pr.body.grad_color = btn_pr.body.main_color;
list_btn_pr.body.border.color = lv_color_hsv_to_rgb(_hue, 10, 5);
list_btn_pr.body.border.width = 0;
list_btn_pr.body.padding.ver = LV_DPI / 6;
list_btn_pr.body.padding.hor = LV_DPI / 8;
list_btn_pr.body.padding.top = LV_DPI / 6;
list_btn_pr.body.padding.bottom = LV_DPI / 6;
list_btn_pr.body.padding.left = LV_DPI / 8;
list_btn_pr.body.padding.right = LV_DPI / 8;
list_btn_pr.text.color = lv_color_hsv_to_rgb(_hue, 5, 80);
list_btn_pr.image.color = lv_color_hsv_to_rgb(_hue, 5, 80);
@ -592,8 +619,10 @@ static void ddlist_init(void)
#if LV_USE_DDLIST != 0
lv_style_copy(&ddlist_bg, &btn_rel);
ddlist_bg.text.line_space = LV_DPI / 8;
ddlist_bg.body.padding.ver = LV_DPI / 8;
ddlist_bg.body.padding.hor = LV_DPI / 8;
ddlist_bg.body.padding.top = LV_DPI / 8;
ddlist_bg.body.padding.bottom = LV_DPI / 8;
ddlist_bg.body.padding.left = LV_DPI / 8;
ddlist_bg.body.padding.right = LV_DPI / 8;
ddlist_bg.body.radius = LV_DPI / 30;
lv_style_copy(&ddlist_sel, &btn_rel);
@ -652,8 +681,10 @@ static void table_init(void)
lv_style_copy(&cell, &panel);
cell.body.radius = 0;
cell.body.border.width = 1;
cell.body.padding.hor = LV_DPI / 12;
cell.body.padding.ver = LV_DPI / 12;
cell.body.padding.left = LV_DPI / 12;
cell.body.padding.right = LV_DPI / 12;
cell.body.padding.top = LV_DPI / 12;
cell.body.padding.bottom = LV_DPI / 12;
theme.style.table.bg = &lv_style_transp_tight;
@ -674,9 +705,10 @@ static void win_init(void)
win_header.body.main_color = lv_color_hsv_to_rgb(_hue, 10, 20);
win_header.body.grad_color = lv_color_hsv_to_rgb(_hue, 10, 20);
win_header.body.radius = 0;
win_header.body.padding.hor = 0;
win_header.body.padding.ver = 0;
win_header.body.padding.ver = 0;
win_header.body.padding.left = 0;
win_header.body.padding.right = 0;
win_header.body.padding.top = 0;
win_header.body.padding.bottom = 0;
static lv_style_t win_btn_pr;
lv_style_copy(&win_btn_pr, &def);