jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-25 20:26:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '0.1.0-dev' of https://github.com/fvanroie/hasp-lvgl into 0.1.0-dev

Browse Source
This commit is contained in:
fvanroie 2020-04-28 11:37:16 +02:00
commit 6261df1abd
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/lvgl

@ -1 +1 @@
Subproject commit ef0bd78d02909b5bb7d7ef7802c9ffb669b7715c Subproject commit 549c75c07fbabc5c6799ef5d676875eadd5874e6

6
src/hasp_attribute.cpp
View File

@ -266,7 +266,7 @@ static void hasp_local_style_attr(lv_obj_t * obj, const char * attr_p, uint16_t
if(part != 64) if(part != 64)
return lv_obj_set_style_local_bg_color(obj, part, state, color); return lv_obj_set_style_local_bg_color(obj, part, state, color);
else else
return lv_obj_set_style_local_bg_color(obj, LV_PAGE_PART_SCRL, LV_STATE_CHECKED, color); return lv_obj_set_style_local_bg_color(obj, LV_PAGE_PART_SCROLLBAR, LV_STATE_CHECKED, color);
} }
case ATTR_BG_GRAD_COLOR: case ATTR_BG_GRAD_COLOR:
return lv_obj_set_style_local_bg_grad_color(obj, part, state, haspPayloadToColor(payload)); return lv_obj_set_style_local_bg_grad_color(obj, part, state, haspPayloadToColor(payload));
@ -434,7 +434,7 @@ static void hasp_local_style_attr_font(lv_obj_t * obj, const char * attr_p, uint
} else if(attr_p[len - 1] == '4') { } else if(attr_p[len - 1] == '4') {
part = LV_TABLE_PART_CELL4; part = LV_TABLE_PART_CELL4;
// } else if(attr[len - 1] == '9') { // } else if(attr[len - 1] == '9') {
// part = LV_PAGE_PART_SCRL; // part = LV_PAGE_PART_SCROLLBAR;
} }
// Remove Trailing part digit // Remove Trailing part digit
@ -802,7 +802,7 @@ static inline bool is_true(const char * s)
static inline bool only_digits(const char * s) static inline bool only_digits(const char * s)
{ {
size_t digits = 0; size_t digits = 0;
while((s + digits) != '\0' && isdigit(*(s + digits))) { while(*(s + digits) != '\0' && isdigit(*(s + digits))) {
digits++; digits++;
} }
return strlen(s) == digits; return strlen(s) == digits;