mirror of
https://github.com/HASwitchPlate/openHASP.git
synced 2025-07-24 11:46:34 +00:00
Check hasp_local_style_attr last
This commit is contained in:
parent
968a78f3a3
commit
b926e984e3
@ -1971,13 +1971,7 @@ void hasp_process_obj_attribute(lv_obj_t* obj, const char* attribute, const char
|
||||
break;
|
||||
|
||||
default: {
|
||||
bool result;
|
||||
hasp_local_style_attr(obj, attribute, attr_hash, payload, update, result);
|
||||
if(result) {
|
||||
ret = ATTR_TYPE_METHOD_OK;
|
||||
} else {
|
||||
ret = ATTR_NOT_FOUND;
|
||||
}
|
||||
break; // not found
|
||||
}
|
||||
}
|
||||
|
||||
@ -2017,6 +2011,16 @@ void hasp_process_obj_attribute(lv_obj_t* obj, const char* attribute, const char
|
||||
}
|
||||
}
|
||||
|
||||
if(ret == ATTR_NOT_FOUND) {
|
||||
bool result;
|
||||
hasp_local_style_attr(obj, attribute, attr_hash, payload, update, result);
|
||||
if(result) {
|
||||
ret = ATTR_TYPE_METHOD_OK;
|
||||
} else {
|
||||
ret = ATTR_NOT_FOUND;
|
||||
}
|
||||
}
|
||||
|
||||
// Positive return codes have returned a value, negative are warnings
|
||||
if(update && ret > 0) return; // done
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user