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

img: use self_size and LV_SIZE_AUTO to automatically set size to image size

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2020-09-29 14:27:15 +02:00
parent 132e79fa42
commit 06281e38cf
2 changed files with 14 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/lv_widgets/lv_img.c
View File

@@ -84,7 +84,6 @@ lv_obj_t * lv_img_create(lv_obj_t * par, const lv_obj_t * copy)
ext->angle = 0;
ext->zoom = LV_IMG_ZOOM_NONE;
ext->antialias = LV_ANTIALIAS ? 1 : 0;
ext->auto_size = 1;
ext->offset.x = 0;
ext->offset.y = 0;
ext->pivot.x = 0;
@@ -102,23 +101,15 @@ lv_obj_t * lv_img_create(lv_obj_t * par, const lv_obj_t * copy)
/* Enable auto size for non screens
* because image screens are wallpapers
* and must be screen sized*/
if(par != NULL) {
ext->auto_size = 1;
}
else {
ext->auto_size = 0;
}
if(par) lv_obj_set_size(img, LV_SIZE_AUTO, LV_SIZE_AUTO);
}
else {
lv_img_ext_t * copy_ext = lv_obj_get_ext_attr(copy);
ext->auto_size = copy_ext->auto_size;
ext->zoom = copy_ext->zoom;
ext->angle = copy_ext->angle;
ext->antialias = copy_ext->antialias;
ext->offset.x = copy_ext->offset.x;
ext->offset.y = copy_ext->offset.y;
ext->pivot.x = copy_ext->pivot.x;
ext->pivot.y = copy_ext->pivot.y;
ext->zoom = copy_ext->zoom;
ext->angle = copy_ext->angle;
ext->antialias = copy_ext->antialias;
ext->offset = copy_ext->offset;
ext->pivot = copy_ext->pivot;
lv_img_set_src(img, copy_ext->src);
/*Refresh the style with new signal function*/
@@ -143,6 +134,8 @@ void lv_img_set_src(lv_obj_t * img, const void * src_img)
{
LV_ASSERT_OBJ(img, LV_OBJX_NAME);
lv_obj_invalidate(img);
lv_img_src_t src_type = lv_img_src_get_type(src_img);
lv_img_ext_t * ext = lv_obj_get_ext_attr(img);
@@ -225,9 +218,7 @@ void lv_img_set_src(lv_obj_t * img, const void * src_img)
ext->pivot.x = header.w / 2;
ext->pivot.y = header.h / 2;
if(lv_img_get_auto_size(img) != false) {
lv_obj_set_size(img, ext->w, ext->h);
}
_lv_obj_handle_self_size_chg(img);
/*Provide enough room for the rotated corners*/
if(ext->angle || ext->zoom != LV_IMG_ZOOM_NONE) _lv_obj_refresh_ext_draw_pad(img);
@@ -235,21 +226,6 @@ void lv_img_set_src(lv_obj_t * img, const void * src_img)
lv_obj_invalidate(img);
}
/**
* Enable the auto size feature.
* If enabled the object size will be same as the picture size.
* @param img pointer to an image
* @param en true: auto size enable, false: auto size disable
*/
void lv_img_set_auto_size(lv_obj_t * img, bool en)
{
LV_ASSERT_OBJ(img, LV_OBJX_NAME);
lv_img_ext_t * ext = lv_obj_get_ext_attr(img);
ext->auto_size = (en == false ? 0 : 1);
}
/**
* Set an offset for the source of an image.
* so the image will be displayed from the new origin.
@@ -440,20 +416,6 @@ const void * lv_img_get_src(lv_obj_t * img)
return ext->src;
}
/**
* Get the auto size enable attribute
* @param img pointer to an image
* @return true: auto size is enabled, false: auto size is disabled
*/
bool lv_img_get_auto_size(const lv_obj_t * img)
{
LV_ASSERT_OBJ(img, LV_OBJX_NAME);
lv_img_ext_t * ext = lv_obj_get_ext_attr(img);
return ext->auto_size == 0 ? false : true;
}
/**
* Get the offset.x attribute of the img object.
* @param img pointer to an image
@@ -849,6 +811,11 @@ static lv_res_t lv_img_signal(lv_obj_t * img, lv_signal_t sign, void * param)
else
info->result = _lv_obj_is_click_point_on(img, info->point);
}
else if(sign == LV_SIGNAL_GET_SELF_SIZE) {
lv_point_t * p = param;
p->x = ext->w;
p->y = ext->h;
}
return res;
}

16
src/lv_widgets/lv_img.h
View File

@@ -41,7 +41,6 @@ typedef struct {
lv_point_t pivot; /*rotation center of the image*/
uint16_t zoom; /*256 means no zoom, 512 double size, 128 half size*/
uint8_t src_type : 2; /*See: lv_img_src_t*/
uint8_t auto_size : 1; /*1: automatically set the object size to the image size*/
uint8_t cf : 5; /*Color format from `lv_img_color_format_t`*/
uint8_t antialias : 1; /*Apply anti-aliasing in transformations (rotate, zoom)*/
} lv_img_ext_t;
@@ -75,14 +74,6 @@ lv_obj_t * lv_img_create(lv_obj_t * par, const lv_obj_t * copy);
*/
void lv_img_set_src(lv_obj_t * img, const void * src_img);
/**
* Enable the auto size feature.
* If enabled the object size will be same as the picture size.
* @param img pointer to an image
* @param en true: auto size enable, false: auto size disable
*/
void lv_img_set_auto_size(lv_obj_t * img, bool autosize_en);
/**
* Set an offset for the source of an image.
* so the image will be displayed from the new origin.
@@ -146,13 +137,6 @@ void lv_img_set_antialias(lv_obj_t * img, bool antialias);
*/
const void * lv_img_get_src(lv_obj_t * img);
/**
* Get the auto size enable attribute
* @param img pointer to an image
* @return true: auto size is enabled, false: auto size is disabled
*/
bool lv_img_get_auto_size(const lv_obj_t * img);
/**
* Get the offset.x attribute of the img object.
* @param img pointer to an image