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

Merge branch 'dev-7.0' of https://github.com/littlevgl/lvgl into dev-7.0

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi 2020-04-24 20:43:57 +02:00
commit 36b05f5d1f
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lv_core/lv_obj.c
View File

@ -805,7 +805,7 @@ void lv_obj_set_height(lv_obj_t * obj, lv_coord_t h)
* @param obj pointer to an object
* @param w the width without paddings
*/
void lv_obj_set_width_fit(const lv_obj_t * obj, lv_coord_t w)
void lv_obj_set_width_fit(lv_obj_t * obj, lv_coord_t w)
{
lv_style_int_t pleft = lv_obj_get_style_pad_left(obj, LV_OBJ_PART_MAIN);
lv_style_int_t pright = lv_obj_get_style_pad_right(obj, LV_OBJ_PART_MAIN);
@ -818,7 +818,7 @@ void lv_obj_set_width_fit(const lv_obj_t * obj, lv_coord_t w)
* @param obj pointer to an object
* @param h the height without paddings
*/
void lv_obj_set_height_fit(const lv_obj_t * obj, lv_coord_t h)
void lv_obj_set_height_fit(lv_obj_t * obj, lv_coord_t h)
{
lv_style_int_t ptop = lv_obj_get_style_pad_top(obj, LV_OBJ_PART_MAIN);
lv_style_int_t pbottom = lv_obj_get_style_pad_bottom(obj, LV_OBJ_PART_MAIN);

4
src/lv_core/lv_obj.h
View File

@ -431,14 +431,14 @@ void lv_obj_set_height(lv_obj_t * obj, lv_coord_t h);
* @param obj pointer to an object
* @param w the width without paddings
*/
void lv_obj_set_width_fit(const lv_obj_t * obj, lv_coord_t w);
void lv_obj_set_width_fit(lv_obj_t * obj, lv_coord_t w);
/**
* Set the height reduced by the top and bottom padding.
* @param obj pointer to an object
* @param h the height without paddings
*/
void lv_obj_set_height_fit(const lv_obj_t * obj, lv_coord_t h);
void lv_obj_set_height_fit(lv_obj_t * obj, lv_coord_t h);
/**
* Set the width of an object by taking the left and right margin into account.

4
src/lv_misc/lv_mem.h
View File

@ -149,8 +149,8 @@ void * lv_memcpy(void * dst, const void * src, size_t len);
*/
static inline void * lv_memcpy_small(void * dst, const void * src, size_t len)
{
uint8_t * d8 = dst;
const uint8_t * s8 = src;
uint8_t * d8 = (uint8_t *)dst;
const uint8_t * s8 = (const uint8_t *)src;
while(len) {
*d8 = *s8; d8++; s8++;