feat(color): additions to LVGL for Lua scripts (#5179)
This commit is contained in:
@@ -65,7 +65,13 @@ Node convert<ZoneOptionValueTyped>::encode(const ZoneOptionValueTyped& rhs)
|
||||
value["source"] = rhs.value.sourceValue;
|
||||
break;
|
||||
case ZOV_Color:
|
||||
value["color"] = color_to_hex(rhs.value.colorValue);
|
||||
if (rhs.value.colorValue & 0x80000000) {
|
||||
value["color"] = color_to_hex(rhs.value.colorValue & 0xFFFFFF);
|
||||
} else {
|
||||
std::string s("COLIDX");
|
||||
s += std::to_string(rhs.value.colorValue);
|
||||
value["color"] = s;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
@@ -86,7 +92,17 @@ bool convert<ZoneOptionValueTyped>::decode(const Node& node,
|
||||
value["boolValue"] >> rhs.value.boolValue;
|
||||
value["stringValue"] >> rhs.value.stringValue;
|
||||
value["source"] >> rhs.value.sourceValue;
|
||||
value["color"] >> rhs.value.colorValue;
|
||||
std::string s;
|
||||
value["color"] >> s;
|
||||
if (s.substr(0, 6) == "COLIDX") {
|
||||
// Index color
|
||||
rhs.value.colorValue = stoi(s.substr(6));
|
||||
} else {
|
||||
unsigned int c;
|
||||
sscanf(s.c_str(), "0x%x", &c);
|
||||
// Mark as RGB color
|
||||
rhs.value.colorValue = c | 0x80000000;
|
||||
}
|
||||
}
|
||||
}
|
||||
return true;
|
||||
|
||||
Reference in New Issue
Block a user