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

Merge branch 'master' of https://github.com/littlevgl/lvgl

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2021-03-29 21:18:21 +02:00
parent 722f1ca689 e7c0401116
commit a9f86c96b3
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/lv_obj_pos.c
View File

@@ -256,7 +256,7 @@ void lv_obj_mark_layout_as_dirty(lv_obj_t * obj)
lv_timer_pause(disp->refr_timer, false); lv_timer_pause(disp->refr_timer, false);
} }
void lv_obj_update_layout(lv_obj_t * obj) void lv_obj_update_layout(const lv_obj_t * obj)
{ {
static bool mutex = false; static bool mutex = false;
if(mutex) { if(mutex) {

2
src/core/lv_obj_pos.h
View File

@@ -128,7 +128,7 @@ void lv_obj_mark_layout_as_dirty(struct _lv_obj_t * obj);
* Update the layout of an object. * Update the layout of an object.
* @param obj pointer to an object whose children needs to be updated * @param obj pointer to an object whose children needs to be updated
*/ */
void lv_obj_update_layout(struct _lv_obj_t * obj); void lv_obj_update_layout(const struct _lv_obj_t * obj);
/** /**
* Regsiter a new layout * Regsiter a new layout

2
src/lv_conf_internal.h
View File

@@ -882,7 +882,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/
#endif #endif
/*Pixel perfect monospace fonts /*Pixel perfect monospace fonts
*http://pelulamu.net/unscii/*/ *http://pelulamu.net/unscii/ */
#ifndef LV_FONT_UNSCII_8 #ifndef LV_FONT_UNSCII_8
# ifdef CONFIG_LV_FONT_UNSCII_8 # ifdef CONFIG_LV_FONT_UNSCII_8
# define LV_FONT_UNSCII_8 CONFIG_LV_FONT_UNSCII_8 # define LV_FONT_UNSCII_8 CONFIG_LV_FONT_UNSCII_8