Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-01-14 06:42:58 +08:00
Code Issues Projects Releases Wiki Activity

feat(img): support LV_PCT for pivot (#4495)

Browse Source 
Signed-off-by: Xu Xingliang <xuxingliang@xiaomi.com>
This commit is contained in:
Neo Xu 2023-08-29 03:27:37 +08:00 committed by GitHub
parent 3c47aadacf
commit 362a8e676e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 46 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/misc/lv_area.h
View File

@ -306,6 +306,15 @@ static inline lv_coord_t lv_pct(lv_coord_t x)
return LV_PCT(x);
}
static inline lv_coord_t lv_pct_to_px(lv_coord_t v, lv_coord_t base)
{
if(LV_COORD_IS_PCT(v)) {
return (LV_COORD_GET_PCT(v) * base) / 100;
}
return v;
}
#ifdef __cplusplus
} /*extern "C"*/
#endif

54
src/widgets/img/lv_img.c
View File

@ -143,8 +143,6 @@ void lv_img_set_src(lv_obj_t * obj, const void * src)
img->w = header.w;
img->h = header.h;
img->cf = header.cf;
img->pivot.x = header.w / 2;
img->pivot.y = header.h / 2;
lv_obj_refresh_self_size(obj);
@ -192,7 +190,9 @@ void lv_img_set_angle(lv_obj_t * obj, int16_t angle)
lv_coord_t w = lv_obj_get_width(obj);
lv_coord_t h = lv_obj_get_height(obj);
lv_area_t a;
_lv_img_buf_get_transformed_area(&a, w, h, img->angle, img->zoom, &img->pivot);
lv_point_t pivot_px;
lv_img_get_pivot(obj, &pivot_px);
_lv_img_buf_get_transformed_area(&a, w, h, img->angle, img->zoom, &pivot_px);
a.x1 += obj->coords.x1;
a.y1 += obj->coords.y1;
a.x2 += obj->coords.x1;
@ -208,7 +208,7 @@ void lv_img_set_angle(lv_obj_t * obj, int16_t angle)
lv_obj_refresh_ext_draw_size(obj);
lv_disp_enable_invalidation(disp, true);
_lv_img_buf_get_transformed_area(&a, w, h, img->angle, img->zoom, &img->pivot);
_lv_img_buf_get_transformed_area(&a, w, h, img->angle, img->zoom, &pivot_px);
a.x1 += obj->coords.x1;
a.y1 += obj->coords.y1;
a.x2 += obj->coords.x1;
@ -232,7 +232,9 @@ void lv_img_set_pivot(lv_obj_t * obj, lv_coord_t x, lv_coord_t y)
lv_coord_t w = lv_obj_get_width(obj);
lv_coord_t h = lv_obj_get_height(obj);
lv_area_t a;
_lv_img_buf_get_transformed_area(&a, w, h, img->angle, img->zoom, &img->pivot);
lv_point_t pivot_px;
lv_img_get_pivot(obj, &pivot_px);
_lv_img_buf_get_transformed_area(&a, w, h, img->angle, img->zoom, &pivot_px);
a.x1 += obj->coords.x1;
a.y1 += obj->coords.y1;
a.x2 += obj->coords.x1;
@ -249,7 +251,8 @@ void lv_img_set_pivot(lv_obj_t * obj, lv_coord_t x, lv_coord_t y)
lv_obj_refresh_ext_draw_size(obj);
lv_disp_enable_invalidation(disp, true);
_lv_img_buf_get_transformed_area(&a, w, h, img->angle, img->zoom, &img->pivot);
lv_img_get_pivot(obj, &pivot_px);
_lv_img_buf_get_transformed_area(&a, w, h, img->angle, img->zoom, &pivot_px);
a.x1 += obj->coords.x1;
a.y1 += obj->coords.y1;
a.x2 += obj->coords.x1;
@ -274,7 +277,9 @@ void lv_img_set_zoom(lv_obj_t * obj, uint16_t zoom)
lv_coord_t w = lv_obj_get_width(obj);
lv_coord_t h = lv_obj_get_height(obj);
lv_area_t a;
_lv_img_buf_get_transformed_area(&a, w, h, img->angle, img->zoom, &img->pivot);
lv_point_t pivot_px;
lv_img_get_pivot(obj, &pivot_px);
_lv_img_buf_get_transformed_area(&a, w, h, img->angle, img->zoom, &pivot_px);
a.x1 += obj->coords.x1 - 1;
a.y1 += obj->coords.y1 - 1;
a.x2 += obj->coords.x1 + 1;
@ -290,7 +295,7 @@ void lv_img_set_zoom(lv_obj_t * obj, uint16_t zoom)
lv_obj_refresh_ext_draw_size(obj);
lv_disp_enable_invalidation(disp, true);
_lv_img_buf_get_transformed_area(&a, w, h, img->angle, img->zoom, &img->pivot);
_lv_img_buf_get_transformed_area(&a, w, h, img->angle, img->zoom, &pivot_px);
a.x1 += obj->coords.x1 - 1;
a.y1 += obj->coords.y1 - 1;
a.x2 += obj->coords.x1 + 1;
@ -363,7 +368,8 @@ void lv_img_get_pivot(lv_obj_t * obj, lv_point_t * pivot)
lv_img_t * img = (lv_img_t *)obj;
*pivot = img->pivot;
pivot->x = lv_pct_to_px(img->pivot.x, img->w);
pivot->y = lv_pct_to_px(img->pivot.y, img->h);
}
lv_coord_t lv_img_get_zoom(lv_obj_t * obj)
@ -412,8 +418,8 @@ static void lv_img_constructor(const lv_obj_class_t * class_p, lv_obj_t * obj)
img->antialias = LV_COLOR_DEPTH > 8 ? 1 : 0;
img->offset.x = 0;
img->offset.y = 0;
img->pivot.x = 0;
img->pivot.y = 0;
img->pivot.x = LV_PCT(50); /*Default pivot to image center*/
img->pivot.y = LV_PCT(50);
img->obj_size_mode = LV_IMG_SIZE_MODE_VIRTUAL;
lv_obj_clear_flag(obj, LV_OBJ_FLAG_CLICKABLE);
@ -439,8 +445,11 @@ static lv_point_t lv_img_get_transformed_size(lv_obj_t * obj)
lv_area_t area_transform;
lv_point_t pivot_px;
lv_img_get_pivot(obj, &pivot_px);
_lv_img_buf_get_transformed_area(&area_transform, img->w, img->h,
img->angle, img->zoom, &img->pivot);
img->angle, img->zoom, &pivot_px);
return (lv_point_t) {
lv_area_get_width(&area_transform), lv_area_get_height(&area_transform)
@ -462,6 +471,8 @@ static void lv_img_event(const lv_obj_class_t * class_p, lv_event_t * e)
lv_obj_t * obj = lv_event_get_target(e);
lv_img_t * img = (lv_img_t *)obj;
lv_point_t pivot_px;
lv_img_get_pivot(obj, &pivot_px);
if(code == LV_EVENT_STYLE_CHANGED) {
/*Refresh the file name to refresh the symbol text size*/
@ -482,7 +493,7 @@ static void lv_img_event(const lv_obj_class_t * class_p, lv_event_t * e)
lv_area_t a;
lv_coord_t w = lv_obj_get_width(obj);
lv_coord_t h = lv_obj_get_height(obj);
_lv_img_buf_get_transformed_area(&a, w, h, img->angle, img->zoom, &img->pivot);
_lv_img_buf_get_transformed_area(&a, w, h, img->angle, img->zoom, &pivot_px);
*s = LV_MAX(*s, -a.x1);
*s = LV_MAX(*s, -a.y1);
*s = LV_MAX(*s, a.x2 - w);
@ -500,7 +511,7 @@ static void lv_img_event(const lv_obj_class_t * class_p, lv_event_t * e)
lv_coord_t w = lv_obj_get_width(obj);
lv_coord_t h = lv_obj_get_height(obj);
lv_area_t coords;
_lv_img_buf_get_transformed_area(&coords, w, h, img->angle, img->zoom, &img->pivot);
_lv_img_buf_get_transformed_area(&coords, w, h, img->angle, img->zoom, &pivot_px);
coords.x1 += obj->coords.x1;
coords.y1 += obj->coords.y1;
coords.x2 += obj->coords.x1;
@ -568,7 +579,9 @@ static void draw_img(lv_event_t * e)
}
else {
lv_area_t a;
_lv_img_buf_get_transformed_area(&a, lv_obj_get_width(obj), lv_obj_get_height(obj), 0, img->zoom, &img->pivot);
lv_point_t pivot_px;
lv_img_get_pivot(obj, &pivot_px);
_lv_img_buf_get_transformed_area(&a, lv_obj_get_width(obj), lv_obj_get_height(obj), 0, img->zoom, &pivot_px);
a.x1 += obj->coords.x1;
a.y1 += obj->coords.y1;
a.x2 += obj->coords.x1;
@ -592,8 +605,11 @@ static void draw_img(lv_event_t * e)
lv_coord_t pbottom = lv_obj_get_style_pad_bottom(obj, LV_PART_MAIN) + border_width;
lv_point_t bg_pivot;
bg_pivot.x = img->pivot.x + pleft;
bg_pivot.y = img->pivot.y + ptop;
lv_point_t pivot_px;
lv_img_get_pivot(obj, &pivot_px);
bg_pivot.x = pivot_px.x + pleft;
bg_pivot.y = pivot_px.y + ptop;
lv_area_t bg_coords;
if(img->obj_size_mode == LV_IMG_SIZE_MODE_REAL) {
@ -654,8 +670,8 @@ static void draw_img(lv_event_t * e)
img_dsc.zoom = img->zoom;
img_dsc.angle = img->angle;
img_dsc.pivot.x = img->pivot.x;
img_dsc.pivot.y = img->pivot.y;
img_dsc.pivot.x = pivot_px.x;
img_dsc.pivot.y = pivot_px.y;
img_dsc.antialias = img->antialias;
img_dsc.src = img->src;

2
src/widgets/img/lv_img.h
View File

@ -127,6 +127,7 @@ void lv_img_set_angle(lv_obj_t * obj, int16_t angle);
/**
* Set the rotation center of the image.
* The image will be rotated around this point.
* x, y can be set with value of LV_PCT, lv_img_get_pivot will return the true pixel coordinate of pivot in this case.
* @param obj pointer to an image object
* @param x rotation center x of the image
* @param y rotation center y of the image
@ -196,6 +197,7 @@ lv_coord_t lv_img_get_angle(lv_obj_t * obj);
/**
* Get the pivot (rotation center) of the image.
* If pivot is set with LV_PCT, convert it to px before return.
* @param obj pointer to an image object
* @param pivot store the rotation center here
*/