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

Add Switch parts

Browse Source
This commit is contained in:
fvanroie 2021-01-08 01:37:21 +01:00
parent 2ebd136dc4
commit a94e3e2fe3
1 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/hasp/hasp_attribute.cpp
View File

@ -608,17 +608,15 @@ static void hasp_attribute_get_part_state(lv_obj_t * obj, const char * attr_in,
return; return;
} }
if(check_obj_type(obj, LV_HASP_BAR)) { #if(LV_SLIDER_PART_INDIC != LV_SWITCH_PART_INDIC) || (LV_SLIDER_PART_KNOB != LV_SWITCH_PART_KNOB) || \
if(index == 1) { (LV_SLIDER_PART_BG != LV_SWITCH_PART_BG) || (LV_SLIDER_PART_INDIC != LV_ARC_PART_INDIC) || \
part = LV_BAR_PART_INDIC; (LV_SLIDER_PART_KNOB != LV_ARC_PART_KNOB) || (LV_SLIDER_PART_BG != LV_ARC_PART_BG) || \
} else { (LV_SLIDER_PART_INDIC != LV_BAR_PART_INDIC) || (LV_SLIDER_PART_BG != LV_BAR_PART_BG)
part = LV_BAR_PART_BG; #error "LV_SLIDER, LV_BAR, LV_ARC, LV_SWITCH parts should match!"
} #endif
state = LV_STATE_DEFAULT;
return;
}
if(check_obj_type(obj, LV_HASP_SLIDER)) { if(check_obj_type(obj, LV_HASP_SLIDER) || check_obj_type(obj, LV_HASP_SWITCH) || check_obj_type(obj, LV_HASP_ARC) ||
check_obj_type(obj, LV_HASP_BAR)) {
if(index == 1) { if(index == 1) {
part = LV_SLIDER_PART_INDIC; part = LV_SLIDER_PART_INDIC;
} else if(index == 2) { } else if(index == 2) {
@ -630,18 +628,6 @@ static void hasp_attribute_get_part_state(lv_obj_t * obj, const char * attr_in,
return; return;
} }
if(check_obj_type(obj, LV_HASP_ARC)) {
if(index == 1) {
part = LV_ARC_PART_INDIC;
} else if(index == 2) {
part = LV_ARC_PART_KNOB;
} else {
part = LV_ARC_PART_BG;
}
state = LV_STATE_DEFAULT;
return;
}
if(check_obj_type(obj, LV_HASP_CHECKBOX)) { if(check_obj_type(obj, LV_HASP_CHECKBOX)) {
if(index == 1) { if(index == 1) {
part = LV_CHECKBOX_PART_BULLET; part = LV_CHECKBOX_PART_BULLET;
@ -661,6 +647,11 @@ static void hasp_attribute_get_part_state(lv_obj_t * obj, const char * attr_in,
state = LV_STATE_DEFAULT; state = LV_STATE_DEFAULT;
return; return;
} }
// if(check_obj_type(obj, LV_HASP_LMETER)) {
// state = LV_STATE_DEFAULT;
// return;
// }
} }
/** /**
@ -871,7 +862,7 @@ static void hasp_local_style_attr(lv_obj_t * obj, const char * attr_p, uint16_t
lv_obj_set_style_local_value_str(obj, part, state, str_p); lv_obj_set_style_local_value_str(obj, part, state, str_p);
if(str != NULL) { if(str != NULL) {
//lv_mem_free(str); // TODO : BIG Memory Leak ! / crashes // lv_mem_free(str); // TODO : BIG Memory Leak ! / crashes
} }
} }
} else { } else {