Mirrors_UI_SDK/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2026-06-04 06:42:54 +08:00
Code Issues Actions 154 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Themba Dube
2019-10-31 20:21:28 -04:00
parent 9baef1ef96 fb9fb8d09e
commit b02bf9d804
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lv_misc/lv_color.h
+7 -4
View File
@@ -96,10 +96,13 @@ enum {
typedef union typedef union
{ {
uint8_t blue : 1; struct
uint8_t green : 1; {
uint8_t red : 1; uint8_t blue : 1;
uint8_t full : 1; uint8_t green : 1;
uint8_t red : 1;
} ch;
uint8_t full;
} lv_color1_t; } lv_color1_t;
typedef union typedef union
src/lv_objx/lv_cb.h
+1 -1
View File
@@ -149,7 +149,7 @@ static inline bool lv_cb_is_checked(const lv_obj_t * cb)
*/ */
static inline bool lv_cb_is_inactive(const lv_obj_t * cb) static inline bool lv_cb_is_inactive(const lv_obj_t * cb)
{ {
return lv_btn_get_state(cb) == LV_BTN_STATE_INA ? false : true; return lv_btn_get_state(cb) == LV_BTN_STATE_INA ? true :false;
} }
/** /**
src/lv_objx/lv_label.h
+1 -1
View File
@@ -33,7 +33,7 @@ extern "C" {
*********************/ *********************/
#define LV_LABEL_DOT_NUM 3 #define LV_LABEL_DOT_NUM 3
#define LV_LABEL_POS_LAST 0xFFFF #define LV_LABEL_POS_LAST 0xFFFF
#define LV_LABEL_TEXT_SEL_OFF 0 #define LV_LABEL_TEXT_SEL_OFF LV_DRAW_LABEL_NO_TXT_SEL
LV_EXPORT_CONST_INT(LV_LABEL_DOT_NUM); LV_EXPORT_CONST_INT(LV_LABEL_DOT_NUM);
LV_EXPORT_CONST_INT(LV_LABEL_POS_LAST); LV_EXPORT_CONST_INT(LV_LABEL_POS_LAST);