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

scroll: handle styles

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi 2020-07-14 20:07:49 +02:00
parent f3a1028064
commit a86e03371f
4 changed files with 145 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

195
src/lv_core/lv_obj.c
View File

@ -48,6 +48,7 @@
#define LV_OBJX_NAME "lv_obj" #define LV_OBJX_NAME "lv_obj"
#define LV_OBJ_DEF_WIDTH (LV_DPX(100)) #define LV_OBJ_DEF_WIDTH (LV_DPX(100))
#define LV_OBJ_DEF_HEIGHT (LV_DPX(50)) #define LV_OBJ_DEF_HEIGHT (LV_DPX(50))
#define SCROLLBAR_MIN_SIZE (LV_DPX(10))
/********************** /**********************
* TYPEDEFS * TYPEDEFS
@ -104,8 +105,8 @@ static void refresh_event_task_cb(lv_task_t * t);
static bool obj_valid_child(const lv_obj_t * parent, const lv_obj_t * obj_to_find); static bool obj_valid_child(const lv_obj_t * parent, const lv_obj_t * obj_to_find);
static void lv_obj_del_async_cb(void * obj); static void lv_obj_del_async_cb(void * obj);
static void obj_del_core(lv_obj_t * obj); static void obj_del_core(lv_obj_t * obj);
static lv_res_t get_ver_scrollbar_area(lv_obj_t * obj, lv_area_t * sbv); static lv_res_t scrollbar_init_draw_dsc(lv_obj_t * obj, lv_draw_rect_dsc_t * dsc);
static lv_res_t get_hor_scrollbar_area(lv_obj_t * obj, lv_area_t * sbh); static void scrollbar_get_area(lv_obj_t * obj, lv_area_t * ver, lv_area_t * hor, const lv_area_t * clip_area);
/********************** /**********************
* STATIC VARIABLES * STATIC VARIABLES
@ -3882,25 +3883,22 @@ static lv_design_res_t lv_obj_design(lv_obj_t * obj, const lv_area_t * clip_area
/*Add the mask and use `obj+8` as custom id. Don't use `obj` directly because it might be used by the user*/ /*Add the mask and use `obj+8` as custom id. Don't use `obj` directly because it might be used by the user*/
lv_draw_mask_add(mp, obj + 8); lv_draw_mask_add(mp, obj + 8);
} }
if(lv_obj_get_screen(obj) == lv_scr_act()) {
lv_area_t sb;
if(get_ver_scrollbar_area(obj, &sb)) {
lv_draw_rect_dsc_t sb_rect_dsc;
lv_draw_rect_dsc_init(&sb_rect_dsc);
sb_rect_dsc.bg_color = LV_COLOR_RED;
lv_draw_rect(&sb, clip_area, &sb_rect_dsc);
}
if(get_hor_scrollbar_area(obj, &sb)) {
lv_draw_rect_dsc_t sb_rect_dsc;
lv_draw_rect_dsc_init(&sb_rect_dsc);
sb_rect_dsc.bg_color = LV_COLOR_BLUE;
lv_draw_rect(&sb, clip_area, &sb_rect_dsc);
}
}
} }
else if(mode == LV_DESIGN_DRAW_POST) { else if(mode == LV_DESIGN_DRAW_POST) {
if(lv_obj_get_screen(obj) == lv_scr_act()) {
lv_draw_rect_dsc_t sb_rect_dsc;
lv_res_t sb_res = scrollbar_init_draw_dsc(obj, &sb_rect_dsc);
if(sb_res == LV_RES_OK) {
lv_area_t hor_area;
lv_area_t ver_area;
scrollbar_get_area(obj, &hor_area, &ver_area, clip_area);
lv_draw_rect(&hor_area, clip_area, &sb_rect_dsc);
lv_draw_rect(&ver_area, clip_area, &sb_rect_dsc);
}
}
if(lv_obj_get_style_clip_corner(obj, LV_OBJ_PART_MAIN)) { if(lv_obj_get_style_clip_corner(obj, LV_OBJ_PART_MAIN)) {
lv_draw_mask_radius_param_t * param = lv_draw_mask_remove_custom(obj + 8); lv_draw_mask_radius_param_t * param = lv_draw_mask_remove_custom(obj + 8);
_lv_mem_buf_release(param); _lv_mem_buf_release(param);
@ -4583,71 +4581,126 @@ static bool obj_valid_child(const lv_obj_t * parent, const lv_obj_t * obj_to_fin
return false; return false;
} }
static lv_res_t get_ver_scrollbar_area(lv_obj_t * obj, lv_area_t * sbv) static lv_res_t scrollbar_init_draw_dsc(lv_obj_t * obj, lv_draw_rect_dsc_t * dsc)
{ {
lv_coord_t obj_h = lv_obj_get_height(obj); lv_draw_rect_dsc_init(dsc);
dsc->bg_opa = 100;//lv_obj_get_style_scrollbar_bg_opa(obj, LV_OBJ_PART_MAIN);
if(dsc->bg_opa > LV_OPA_MIN) {
dsc->bg_color = lv_obj_get_style_scrollbar_bg_color(obj, LV_OBJ_PART_MAIN);
}
lv_area_t child_box; dsc->border_opa = lv_obj_get_style_scrollbar_border_opa(obj, LV_OBJ_PART_MAIN);
lv_res_t res = lv_obj_get_children_box(obj, &child_box); if(dsc->border_opa > LV_OPA_MIN) {
if(res != LV_RES_OK) return res; dsc->border_width = lv_obj_get_style_scrollbar_border_opa(obj, LV_OBJ_PART_MAIN);
if(dsc->border_width > 0) {
dsc->border_color = lv_obj_get_style_scrollbar_border_color(obj, LV_OBJ_PART_MAIN);
} else {
dsc->border_opa = LV_OPA_TRANSP;
}
}
lv_coord_t content_h = (child_box.y2 - obj->scroll.y) - obj->coords.y1 ; if(dsc->bg_opa != LV_OPA_TRANSP || dsc->border_opa != LV_OPA_TRANSP) {
if(content_h < obj_h) { dsc->radius = 20;//lv_obj_get_style_scrollbar_radius(obj, LV_OBJ_PART_MAIN);
return LV_RES_OK;
} else {
return LV_RES_INV; return LV_RES_INV;
} }
lv_coord_t sb_h = (obj_h * obj_h) / content_h;
lv_coord_t rem = obj_h - sb_h; /*Remaining size from the scrollbar track that is not the scrollbar itself*/
lv_coord_t scroll_h = content_h - obj_h; /*The size of the content which can be really scrolled*/
if(scroll_h <= 0) {
sbv->y1 = obj->coords.y1;
sbv->y2 = obj->coords.y2;
sbv->x2 = obj->coords.x2;
sbv->x1 = sbv->x2 - 10;
return LV_RES_OK;
}
lv_coord_t sb_y = (rem * (child_box.y2 - obj->coords.y2)) / scroll_h;
sb_y = rem - sb_y;
sbv->y1 = obj->coords.y1 + sb_y;
sbv->y2 = sbv->y1 + sb_h;
sbv->x2 = obj->coords.x2;
sbv->x1 = sbv->x2 - 10;
return LV_RES_OK;
} }
static lv_res_t get_hor_scrollbar_area(lv_obj_t * obj, lv_area_t * sbh) static void scrollbar_get_area(lv_obj_t * obj, lv_area_t * ver, lv_area_t * hor, const lv_area_t * clip_area)
{ {
lv_coord_t end_space = lv_obj_get_style_scrollbar_space_end(obj, LV_OBJ_PART_MAIN);
lv_coord_t side_space = lv_obj_get_style_scrollbar_space_side(obj, LV_OBJ_PART_MAIN);
lv_coord_t tickness = 10;//lv_obj_get_style_scrollbar_width(obj, LV_OBJ_PART_MAIN);
lv_coord_t obj_h = lv_obj_get_height(obj);
lv_coord_t obj_w = lv_obj_get_width(obj); lv_coord_t obj_w = lv_obj_get_width(obj);
lv_area_t child_box; lv_coord_t st = lv_obj_get_scroll_top(obj);
lv_res_t res = lv_obj_get_children_box(obj, &child_box); lv_coord_t sb = lv_obj_get_scroll_bottom(obj);
if(res != LV_RES_OK) return res; lv_coord_t sl = lv_obj_get_scroll_left(obj);
lv_coord_t sr = lv_obj_get_scroll_right(obj);
lv_coord_t content_w = (child_box.x2 - obj->scroll.x) - obj->coords.x1 ; lv_coord_t ver_reg_space = tickness + side_space;
if(content_w < obj_w) { lv_coord_t hor_req_space = tickness + side_space;
return LV_RES_INV; lv_coord_t rem;
ver->y1 = obj->coords.y1;
ver->y2 = obj->coords.y2;
ver->x2 = obj->coords.x2;
ver->x1 = ver->x2 - tickness;
if(_lv_area_is_on(ver, clip_area)) {
printf("v\n");
lv_coord_t content_h = obj_h + st + sb;
lv_coord_t sb_h = ((obj_h - end_space * 2 - hor_req_space) * obj_h) / content_h;
sb_h = LV_MATH_MAX(sb_h, SCROLLBAR_MIN_SIZE);
rem = (obj_h - end_space * 2 - hor_req_space) - sb_h; /*Remaining size from the scrollbar track that is not the scrollbar itself*/
lv_coord_t scroll_h = content_h - obj_h; /*The size of the content which can be really scrolled*/
if(scroll_h <= 0) {
ver->y1 = obj->coords.y1 + end_space;
ver->y2 = obj->coords.y2 - end_space - hor_req_space;
ver->x2 = obj->coords.x2;
ver->x1 = ver->x2 - tickness;
} else {
lv_coord_t sb_y = (rem * sb) / scroll_h;
sb_y = rem - sb_y;
ver->y1 = obj->coords.y1 + sb_y + end_space;
ver->y2 = ver->y1 + sb_h;
ver->x2 = obj->coords.x2;
ver->x1 = ver->x2 - tickness;
if(ver->y1 < obj->coords.y1) {
ver->y1 = obj->coords.y1;
if(ver->y1 + SCROLLBAR_MIN_SIZE > ver->y2) ver->y2 = ver->y1 + SCROLLBAR_MIN_SIZE;
}
if(ver->y2 > obj->coords.y2) {
ver->y2 = obj->coords.y2;
if(ver->y2 - SCROLLBAR_MIN_SIZE < ver->y1) ver->y1 = ver->y2 - SCROLLBAR_MIN_SIZE;
}
}
} else {
/*Set an invalid area if not in the clip area*/
lv_area_set(ver, -1, -1, -2, -2);
} }
lv_coord_t sb_h = (obj_w * obj_w) / content_w;
lv_coord_t rem = obj_w - sb_h; /*Remaining size from the scrollbar track that is not the scrollbar itself*/ hor->y2 = obj->coords.y2;
lv_coord_t scroll_w = content_w - obj_w; /*The size of the content which can be really scrolled*/ hor->y1 = hor->y2 - tickness;
if(scroll_w <= 0) { hor->x1 = obj->coords.x1;
sbh->y2 = obj->coords.y2; hor->x2 = obj->coords.x2;
sbh->y1 = sbh->y2 - 10; if(_lv_area_is_on(hor, clip_area)) {
sbh->x2 = obj->coords.x2; printf("h\n");
sbh->x1 = obj->coords.x1; lv_coord_t content_w = obj_w + sl + sr;
return LV_RES_OK; lv_coord_t sb_w = ((obj_w - end_space * 2 - ver_reg_space) * obj_w) / content_w;
sb_w = LV_MATH_MAX(sb_w, SCROLLBAR_MIN_SIZE);
rem = (obj_w - end_space * 2 - ver_reg_space) - sb_w; /*Remaining size from the scrollbar track that is not the scrollbar itself*/
lv_coord_t scroll_w = content_w - obj_w; /*The size of the content which can be really scrolled*/
if(scroll_w <= 0) {
hor->y2 = obj->coords.y2;
hor->y1 = hor->y2 - tickness;
hor->x1 = obj->coords.x1 + end_space;
hor->x2 = obj->coords.x2 - end_space - ver_reg_space;
} else {
lv_coord_t sb_x = (rem * sr) / scroll_w;
sb_x = rem - sb_x;
hor->x1 = obj->coords.x1 + sb_x + end_space;
hor->x2 = hor->x1 + sb_w;
hor->y2 = obj->coords.y2;
hor->y1 = hor->y2 - tickness;
if(hor->x1 < obj->coords.x1) {
hor->x1 = obj->coords.x1;
if(hor->x1 + SCROLLBAR_MIN_SIZE > hor->x2) hor->x2 = hor->x1 + SCROLLBAR_MIN_SIZE;
}
if(hor->x2 > obj->coords.x2) {
hor->x2 = obj->coords.x2;
if(hor->x2 - SCROLLBAR_MIN_SIZE < hor->x1) hor->x1 = hor->x2 - SCROLLBAR_MIN_SIZE;
}
}
} else {
/*Set an invalid area if not in the clip area*/
lv_area_set(hor, -1, -1, -2, -2);
} }
lv_coord_t sb_x = (rem * (child_box.x2 - obj->coords.x2)) / scroll_w;
sb_x = rem - sb_x;
sbh->x1 = obj->coords.x1 + sb_x;
sbh->x2 = sbh->x1 + sb_h;
sbh->y2 = obj->coords.y2;
sbh->y1 = sbh->y2 - 10;
return LV_RES_OK;
} }

1
src/lv_core/lv_obj.h
View File

@ -230,6 +230,7 @@ typedef struct _lv_obj_t {
uint8_t adv_hittest : 1; /**< 1: Use advanced hit-testing (slower) */ uint8_t adv_hittest : 1; /**< 1: Use advanced hit-testing (slower) */
uint8_t gesture_parent : 1; /**< 1: Parent will be gesture instead*/ uint8_t gesture_parent : 1; /**< 1: Parent will be gesture instead*/
uint8_t focus_parent : 1; /**< 1: Parent will be focused instead*/ uint8_t focus_parent : 1; /**< 1: Parent will be focused instead*/
lv_drag_dir_t scroll_elastic : 3; /**< In which directions the object can be scrolled */
lv_drag_dir_t drag_dir : 3; /**< In which directions the object can be dragged */ lv_drag_dir_t drag_dir : 3; /**< In which directions the object can be dragged */
lv_drag_dir_t scroll_dir : 3; /**< In which directions the object can be scrolled */ lv_drag_dir_t scroll_dir : 3; /**< In which directions the object can be scrolled */

10
src/lv_core/lv_obj_style_dec.h
View File

@ -197,6 +197,16 @@ _LV_OBJ_STYLE_SET_GET_DECLARE(SCALE_END_LINE_WIDTH, scale_end_line_width, lv_sty
_LV_OBJ_STYLE_SET_GET_DECLARE(SCALE_GRAD_COLOR, scale_grad_color, lv_color_t, _color, nonscalar) _LV_OBJ_STYLE_SET_GET_DECLARE(SCALE_GRAD_COLOR, scale_grad_color, lv_color_t, _color, nonscalar)
_LV_OBJ_STYLE_SET_GET_DECLARE(SCALE_END_COLOR, scale_end_color, lv_color_t, _color, nonscalar) _LV_OBJ_STYLE_SET_GET_DECLARE(SCALE_END_COLOR, scale_end_color, lv_color_t, _color, nonscalar)
_LV_OBJ_STYLE_SET_GET_DECLARE(SCROLLBAR_WIDTH, scrollbar_width, lv_style_int_t, _int, scalar)
_LV_OBJ_STYLE_SET_GET_DECLARE(SCROLLBAR_SPACE_SIDE, scrollbar_space_side, lv_style_int_t, _int, scalar)
_LV_OBJ_STYLE_SET_GET_DECLARE(SCROLLBAR_SPACE_END, scrollbar_space_end, lv_style_int_t, _int, scalar)
_LV_OBJ_STYLE_SET_GET_DECLARE(SCROLLBAR_RADIUS, scrollbar_radius, lv_style_int_t, _int, scalar)
_LV_OBJ_STYLE_SET_GET_DECLARE(SCROLLBAR_BORDER_WIDTH, scrollbar_border_width, lv_style_int_t, _int, scalar)
_LV_OBJ_STYLE_SET_GET_DECLARE(SCROLLBAR_BG_COLOR, scrollbar_bg_color, lv_color_t, _color, nonscalar)
_LV_OBJ_STYLE_SET_GET_DECLARE(SCROLLBAR_BORDER_COLOR, scrollbar_border_color, lv_color_t, _color, nonscalar)
_LV_OBJ_STYLE_SET_GET_DECLARE(SCROLLBAR_BG_OPA, scrollbar_bg_opa, lv_opa_t, _opa, scalar)
_LV_OBJ_STYLE_SET_GET_DECLARE(SCROLLBAR_BORDER_OPA, scrollbar_border_opa, lv_opa_t, _opa, scalar)
#undef _LV_OBJ_STYLE_SET_GET_DECLARE #undef _LV_OBJ_STYLE_SET_GET_DECLARE

10
src/lv_core/lv_style.h
View File

@ -197,6 +197,16 @@ enum {
LV_STYLE_PROP_INIT(LV_STYLE_SCALE_END_LINE_WIDTH, 0xC, LV_STYLE_ID_VALUE + 3, LV_STYLE_ATTR_NONE), LV_STYLE_PROP_INIT(LV_STYLE_SCALE_END_LINE_WIDTH, 0xC, LV_STYLE_ID_VALUE + 3, LV_STYLE_ATTR_NONE),
LV_STYLE_PROP_INIT(LV_STYLE_SCALE_GRAD_COLOR, 0xC, LV_STYLE_ID_COLOR + 0, LV_STYLE_ATTR_NONE), LV_STYLE_PROP_INIT(LV_STYLE_SCALE_GRAD_COLOR, 0xC, LV_STYLE_ID_COLOR + 0, LV_STYLE_ATTR_NONE),
LV_STYLE_PROP_INIT(LV_STYLE_SCALE_END_COLOR, 0xC, LV_STYLE_ID_COLOR + 1, LV_STYLE_ATTR_NONE), LV_STYLE_PROP_INIT(LV_STYLE_SCALE_END_COLOR, 0xC, LV_STYLE_ID_COLOR + 1, LV_STYLE_ATTR_NONE),
LV_STYLE_PROP_INIT(LV_STYLE_SCROLLBAR_WIDTH, 0xD, LV_STYLE_ID_VALUE + 0, LV_STYLE_ATTR_NONE),
LV_STYLE_PROP_INIT(LV_STYLE_SCROLLBAR_SPACE_SIDE, 0xD, LV_STYLE_ID_VALUE + 1, LV_STYLE_ATTR_NONE),
LV_STYLE_PROP_INIT(LV_STYLE_SCROLLBAR_SPACE_END, 0xD, LV_STYLE_ID_VALUE + 2, LV_STYLE_ATTR_NONE),
LV_STYLE_PROP_INIT(LV_STYLE_SCROLLBAR_RADIUS, 0xD, LV_STYLE_ID_VALUE + 3, LV_STYLE_ATTR_NONE),
LV_STYLE_PROP_INIT(LV_STYLE_SCROLLBAR_BORDER_WIDTH, 0xD, LV_STYLE_ID_VALUE + 4, LV_STYLE_ATTR_NONE),
LV_STYLE_PROP_INIT(LV_STYLE_SCROLLBAR_BG_COLOR, 0xD, LV_STYLE_ID_COLOR + 0, LV_STYLE_ATTR_NONE),
LV_STYLE_PROP_INIT(LV_STYLE_SCROLLBAR_BORDER_COLOR, 0xD, LV_STYLE_ID_COLOR + 1, LV_STYLE_ATTR_NONE),
LV_STYLE_PROP_INIT(LV_STYLE_SCROLLBAR_BG_OPA, 0xD, LV_STYLE_ID_OPA + 0, LV_STYLE_ATTR_NONE),
LV_STYLE_PROP_INIT(LV_STYLE_SCROLLBAR_BORDER_OPA, 0xD, LV_STYLE_ID_OPA + 1, LV_STYLE_ATTR_NONE),
}; };
typedef uint16_t lv_style_property_t; typedef uint16_t lv_style_property_t;