chore(color): improvements for Lua LVGL API (#6676)

Co-authored-by: philmoz <phil.a.mitchell@gmail.com>
This commit is contained in:
philmoz
2025-10-27 09:25:48 +10:00
committed by GitHub
co-authored by philmoz
parent b5053ad007
commit f72fcc3f25
6 changed files with 348 additions and 174 deletions
+5
View File
@@ -405,6 +405,11 @@ void Window::show(bool visible)
} }
} }
bool Window::isVisible()
{
return !_deleted && lvobj && !lv_obj_has_flag(lvobj, LV_OBJ_FLAG_HIDDEN);
}
void Window::enable(bool enabled) void Window::enable(bool enabled)
{ {
if (!_deleted && lvobj) { if (!_deleted && lvobj) {
+1
View File
@@ -185,6 +185,7 @@ class Window
virtual void show(bool visible = true); virtual void show(bool visible = true);
void hide() { show(false); } void hide() { show(false); }
bool isVisible();
virtual void enable(bool enabled = true); virtual void enable(bool enabled = true);
void disable() { enable(false); } void disable() { enable(false); }
+20 -20
View File
@@ -292,26 +292,26 @@ void luaDoGc(lua_State * L, bool full)
else { else {
lua_gc(L, LUA_GCSTEP, 10); lua_gc(L, LUA_GCSTEP, 10);
} }
#if defined(DEBUG) // #if defined(DEBUG)
if (L == lsScripts) { // if (L == lsScripts) {
static uint32_t lastgcSctipts = 0; // static uint32_t lastgcSctipts = 0;
uint32_t gc = luaGetMemUsed(L); // uint32_t gc = luaGetMemUsed(L);
if (gc > (lastgcSctipts + GC_REPORT_TRESHOLD) || (gc + GC_REPORT_TRESHOLD) < lastgcSctipts) { // if (gc > (lastgcSctipts + GC_REPORT_TRESHOLD) || (gc + GC_REPORT_TRESHOLD) < lastgcSctipts) {
lastgcSctipts = gc; // lastgcSctipts = gc;
TRACE("GC Use Scripts: %u bytes", gc); // TRACE("GC Use Scripts: %u bytes", gc);
} // }
} // }
#if defined(COLORLCD) // #if defined(COLORLCD)
if (L == lsWidgets) { // if (L == lsWidgets) {
static uint32_t lastgcWidgets = 0; // static uint32_t lastgcWidgets = 0;
uint32_t gc = luaGetMemUsed(L); // uint32_t gc = luaGetMemUsed(L);
if (gc > (lastgcWidgets + GC_REPORT_TRESHOLD) || (gc + GC_REPORT_TRESHOLD) < lastgcWidgets) { // if (gc > (lastgcWidgets + GC_REPORT_TRESHOLD) || (gc + GC_REPORT_TRESHOLD) < lastgcWidgets) {
lastgcWidgets = gc; // lastgcWidgets = gc;
TRACE("GC Use Widgets: %u bytes + Extra %u", gc, luaExtraMemoryUsage); // TRACE("GC Use Widgets: %u bytes + Extra %u", gc, luaExtraMemoryUsage);
} // }
} // }
#endif // #endif
#endif // #endif
} }
else { else {
// we disable Lua for the rest of the session // we disable Lua for the rest of the session
+293 -142
View File
@@ -46,6 +46,8 @@ void LvglParamFuncOrValue::parse(lua_State *L)
{ {
if (lua_isfunction(L, -1)) { if (lua_isfunction(L, -1)) {
function = luaL_ref(L, LUA_REGISTRYINDEX); function = luaL_ref(L, LUA_REGISTRYINDEX);
} else if (lua_isboolean(L, -1)) {
value = lua_toboolean(L, -1);
} else { } else {
value = luaL_checkunsigned(L, -1); value = luaL_checkunsigned(L, -1);
} }
@@ -156,7 +158,7 @@ bool LvglMinMaxParams::parseMinMaxParam(lua_State *L, const char *key)
bool LvglTitleParam::parseTitleParam(lua_State *L, const char *key) bool LvglTitleParam::parseTitleParam(lua_State *L, const char *key)
{ {
if (!strcmp(key, "title")) { if (!strcmp(key, "title")) {
title = luaL_checkstring(L, -1); title.parse(L);
return true; return true;
} }
return false; return false;
@@ -430,6 +432,32 @@ bool LvglWidgetObjectBase::pcallUpdate2Int(lua_State *L, int getFuncRef,
return res; return res;
} }
bool LvglWidgetObjectBase::pcallUpdateStringVal(lua_State *L, int getFuncRef,
std::function<void(const char*)> update)
{
bool res = true;
if (getFuncRef != LUA_REFNIL) {
auto save = luaScriptManager;
luaScriptManager = lvglManager;
int t = lua_gettop(L);
PROTECT_LUA()
{
if (pcallFunc(L, getFuncRef, 1)) {
const char* val = luaL_checkstring(L, -1);
update(val);
} else {
res = false;
}
} else {
lvglManager->luaShowError();
}
UNPROTECT_LUA();
lua_settop(L, t);
luaScriptManager = save;
}
return res;
}
int LvglWidgetObjectBase::pcallGetIntVal(lua_State *L, int getFuncRef) int LvglWidgetObjectBase::pcallGetIntVal(lua_State *L, int getFuncRef)
{ {
int val = 0; int val = 0;
@@ -588,30 +616,33 @@ bool LvglWidgetObjectBase::callRefs(lua_State *L)
return true; return true;
} }
if (!pcallUpdate1Int(L, color.function,
[=](int color) { setColor(color); }))
return false;
if (!pcallUpdate1Int(L, opacity.function,
[=](int opa) { setOpacity(opa); }))
return false;
if (!pcallUpdateBool(L, getVisibleFunction, if (!pcallUpdateBool(L, getVisibleFunction,
[=](bool visible) { if (visible) show(); else hide(); })) [=](bool visible) { if (visible) show(); else hide(); }))
return false; return false;
if (!pcallUpdate2Int(L, getSizeFunction,
[=](int w, int h) { setSize(w, h); }))
return false;
if (!pcallUpdate2Int(L, getPosFunction, [=](int x, int y) { setPos(x, y); }))
return false;
for (size_t i = 0; i < lvglObjectRefs.size(); i += 1) { if (isVisible()) {
lua_rawgeti(L, LUA_REGISTRYINDEX, lvglObjectRefs[i]); if (!pcallUpdate1Int(L, color.function,
auto p = LvglWidgetObjectBase::checkLvgl(L, -1); [=](int color) { setColor(color); }))
lua_pop(L, 1); return false;
if (p) if (!p->callRefs(L)) return false; if (!pcallUpdate1Int(L, opacity.function,
if (clearRequest) { [=](int opa) { setOpacity(opa); }))
clearRequest = false; return false;
clearChildRefs(L); if (!pcallUpdate2Int(L, getSizeFunction,
return true; [=](int w, int h) { setSize(w, h); }))
return false;
if (!pcallUpdate2Int(L, getPosFunction, [=](int x, int y) { setPos(x, y); }))
return false;
for (size_t i = 0; i < lvglObjectRefs.size(); i += 1) {
lua_rawgeti(L, LUA_REGISTRYINDEX, lvglObjectRefs[i]);
auto p = LvglWidgetObjectBase::checkLvgl(L, -1);
lua_pop(L, 1);
if (p) if (!p->callRefs(L)) return false;
if (clearRequest) {
clearRequest = false;
clearChildRefs(L);
return true;
}
} }
} }
@@ -692,12 +723,17 @@ void LvglSimpleWidgetObject::setSize(coord_t w, coord_t h)
void LvglSimpleWidgetObject::show() void LvglSimpleWidgetObject::show()
{ {
if (lvobj) lv_obj_clear_flag(lvobj, LV_OBJ_FLAG_HIDDEN); if (!isVisible()) lv_obj_clear_flag(lvobj, LV_OBJ_FLAG_HIDDEN);
} }
void LvglSimpleWidgetObject::hide() void LvglSimpleWidgetObject::hide()
{ {
if (lvobj) lv_obj_add_flag(lvobj, LV_OBJ_FLAG_HIDDEN); if (isVisible()) lv_obj_add_flag(lvobj, LV_OBJ_FLAG_HIDDEN);
}
bool LvglSimpleWidgetObject::isVisible()
{
return lvobj && !lv_obj_has_flag(lvobj, LV_OBJ_FLAG_HIDDEN);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -713,21 +749,18 @@ void LvglWidgetLabel::parseParam(lua_State *L, const char *key)
bool LvglWidgetLabel::callRefs(lua_State *L) bool LvglWidgetLabel::callRefs(lua_State *L)
{ {
int t = lua_gettop(L); if (!LvglSimpleWidgetObject::callRefs(L)) return false;
if (txt.function != LUA_REFNIL) {
if (pcallFunc(L, txt.function, 1)) { if (isVisible()) {
const char *s = luaL_checkstring(L, -1); if (!pcallUpdateStringVal(L, txt.function, [=](const char* s) { setText(s); }))
setText(s); return false;
lua_settop(L, t); if (!pcallUpdate1Int(L, font.function, [=](int val) { setFont(val); }))
} else { return false;
if (!pcallUpdate1Int(L, align.function, [=](int val) { setAlign(val); }))
return false; return false;
}
} }
if (!pcallUpdate1Int(L, font.function, [=](int val) { setFont(val); }))
return false; return true;
if (!pcallUpdate1Int(L, align.function, [=](int val) { setAlign(val); }))
return false;
return LvglSimpleWidgetObject::callRefs(L);
} }
void LvglWidgetLabel::clearRefs(lua_State *L) void LvglWidgetLabel::clearRefs(lua_State *L)
@@ -807,8 +840,8 @@ void LvglWidgetLineBase::setColor(LcdFlags newColor)
void LvglWidgetLineBase::setOpacity(uint8_t newOpa) void LvglWidgetLineBase::setOpacity(uint8_t newOpa)
{ {
opacity.value = newOpa; if (opacity.changedValue(newOpa))
lv_obj_set_style_line_opa(lvobj, opacity.value, LV_PART_MAIN); lv_obj_set_style_line_opa(lvobj, opacity.value, LV_PART_MAIN);
} }
void LvglWidgetLineBase::setPos(coord_t x, coord_t y) void LvglWidgetLineBase::setPos(coord_t x, coord_t y)
@@ -937,25 +970,30 @@ void LvglWidgetLine::parseParam(lua_State *L, const char *key)
bool LvglWidgetLine::callRefs(lua_State *L) bool LvglWidgetLine::callRefs(lua_State *L)
{ {
int t = lua_gettop(L); if (!LvglSimpleWidgetObject::callRefs(L)) return false;
if (getPointsFunction != LUA_REFNIL) {
if (pcallFunc(L, getPointsFunction, 1)) { if (isVisible()) {
bool firstPts = (pts == nullptr); int t = lua_gettop(L);
uint32_t h = getPts(L); if (getPointsFunction != LUA_REFNIL) {
if (h != ptsHash) { if (pcallFunc(L, getPointsFunction, 1)) {
ptsHash = h; bool firstPts = (pts == nullptr);
setLine(); uint32_t h = getPts(L);
if (h != ptsHash) {
ptsHash = h;
setLine();
}
if (firstPts) {
setColor(color.flags);
setOpacity(opacity.value);
}
lua_settop(L, t);
} else {
return false;
} }
if (firstPts) {
setColor(color.flags);
setOpacity(opacity.value);
}
lua_settop(L, t);
} else {
return false;
} }
} }
return LvglSimpleWidgetObject::callRefs(L);
return true;
} }
void LvglWidgetLine::clearRefs(lua_State *L) void LvglWidgetLine::clearRefs(lua_State *L)
@@ -973,9 +1011,9 @@ void LvglWidgetLine::setColor(LcdFlags newColor)
void LvglWidgetLine::setOpacity(uint8_t newOpa) void LvglWidgetLine::setOpacity(uint8_t newOpa)
{ {
opacity.value = newOpa;
if (lvobj) if (lvobj)
lv_obj_set_style_line_opa(lvobj, opacity.value, LV_PART_MAIN); if (opacity.changedValue(newOpa))
lv_obj_set_style_line_opa(lvobj, opacity.value, LV_PART_MAIN);
} }
void LvglWidgetLine::setPos(coord_t x, coord_t y) void LvglWidgetLine::setPos(coord_t x, coord_t y)
@@ -1073,24 +1111,29 @@ void LvglWidgetTriangle::parseParam(lua_State *L, const char *key)
bool LvglWidgetTriangle::callRefs(lua_State *L) bool LvglWidgetTriangle::callRefs(lua_State *L)
{ {
int t = lua_gettop(L); if (!LvglSimpleWidgetObject::callRefs(L)) return false;
if (getPointsFunction != LUA_REFNIL) {
if (pcallFunc(L, getPointsFunction, 1)) { if (isVisible()) {
luaL_checktype(L, -1, LUA_TTABLE); int t = lua_gettop(L);
getPt(L, 0); if (getPointsFunction != LUA_REFNIL) {
getPt(L, 1); if (pcallFunc(L, getPointsFunction, 1)) {
getPt(L, 2); luaL_checktype(L, -1, LUA_TTABLE);
lua_settop(L, t); getPt(L, 0);
uint32_t h = hash(&pts, sizeof(pts)); getPt(L, 1);
if (h != ptsHash) { getPt(L, 2);
ptsHash = h; lua_settop(L, t);
refresh(); uint32_t h = hash(&pts, sizeof(pts));
if (h != ptsHash) {
ptsHash = h;
refresh();
}
} else {
return false;
} }
} else {
return false;
} }
} }
return LvglSimpleWidgetObject::callRefs(L);
return true;
} }
void LvglWidgetTriangle::clearRefs(lua_State *L) void LvglWidgetTriangle::clearRefs(lua_State *L)
@@ -1360,10 +1403,15 @@ bool LvglWidgetObject::setFlex()
bool LvglWidgetObject::callRefs(lua_State *L) bool LvglWidgetObject::callRefs(lua_State *L)
{ {
if (!pcallUpdateBool(L, getActiveFunction, if (!LvglWidgetObjectBase::callRefs(L)) return false;
[=](bool active) { if (active) enable(); else disable(); }))
return false; if (isVisible()) {
return LvglWidgetObjectBase::callRefs(L); if (!pcallUpdateBool(L, getActiveFunction,
[=](bool active) { if (active) enable(); else disable(); }))
return false;
}
return true;
} }
void LvglWidgetObject::clearRefs(lua_State *L) void LvglWidgetObject::clearRefs(lua_State *L)
@@ -1392,11 +1440,16 @@ coord_t LvglWidgetBox::getScrollY()
bool LvglWidgetBox::callRefs(lua_State *L) bool LvglWidgetBox::callRefs(lua_State *L)
{ {
if (!pcallUpdate2Int(L, scrollToFunction, if (!LvglWidgetObject::callRefs(L)) return false;
[=](int x, int y) { if (x != getScrollX() || y != getScrollY()) lv_obj_scroll_to(window->getLvObj(), x, y, LV_ANIM_OFF); })) {
return false; if (isVisible()) {
if (!pcallUpdate2Int(L, scrollToFunction,
[=](int x, int y) { if (x != getScrollX() || y != getScrollY()) lv_obj_scroll_to(window->getLvObj(), x, y, LV_ANIM_OFF); })) {
return false;
}
} }
return LvglWidgetObject::callRefs(L);
return true;
} }
void LvglWidgetBox::clearRefs(lua_State *L) void LvglWidgetBox::clearRefs(lua_State *L)
@@ -1441,7 +1494,7 @@ void LvglWidgetSetting::build(lua_State *L)
auto lbl = lv_label_create(window->getLvObj()); auto lbl = lv_label_create(window->getLvObj());
lv_obj_align(lbl, LV_ALIGN_LEFT_MID, 0, 0); lv_obj_align(lbl, LV_ALIGN_LEFT_MID, 0, 0);
etx_txt_color(lbl, COLOR_THEME_PRIMARY1_INDEX); etx_txt_color(lbl, COLOR_THEME_PRIMARY1_INDEX);
lv_label_set_text(lbl, title.c_str()); lv_label_set_text(lbl, title.txt.c_str());
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -1450,16 +1503,44 @@ void LvglWidgetBorderedObject::parseParam(lua_State *L, const char *key)
{ {
if (parseThicknessParam(L, key)) return; if (parseThicknessParam(L, key)) return;
if (!strcmp(key, "filled")) { if (!strcmp(key, "filled")) {
filled = lua_toboolean(L, -1); filled.parse(L);
} else { } else {
LvglWidgetBox::parseParam(L, key); LvglWidgetBox::parseParam(L, key);
} }
} }
bool LvglWidgetBorderedObject::callRefs(lua_State *L)
{
if (!LvglWidgetBox::callRefs(L)) return false;
if (isVisible()) {
if (!pcallUpdateBool(L, filled.function, [=](bool val) { setFilled(val); }))
return false;
}
return true;
}
void LvglWidgetBorderedObject::clearRefs(lua_State *L)
{
filled.clearRef(L);
LvglWidgetBox::clearRefs(L);
}
void LvglWidgetBorderedObject::setFilled(int newFilled)
{
if (filled.changedValue(newFilled)) {
color.forceUpdate();
opacity.forceUpdate();
setColor(color.value);
setOpacity(opacity.value);
}
}
void LvglWidgetBorderedObject::setColor(LcdFlags newColor) void LvglWidgetBorderedObject::setColor(LcdFlags newColor)
{ {
if (color.changedColor(newColor)) { if (color.changedColor(newColor)) {
if (filled) { if (filled.value) {
etx_bg_color_from_flags(window->getLvObj(), color.flags); etx_bg_color_from_flags(window->getLvObj(), color.flags);
} else { } else {
if (color.flags & RGB_FLAG) { if (color.flags & RGB_FLAG) {
@@ -1476,15 +1557,23 @@ void LvglWidgetBorderedObject::setColor(LcdFlags newColor)
void LvglWidgetBorderedObject::setOpacity(uint8_t newOpa) void LvglWidgetBorderedObject::setOpacity(uint8_t newOpa)
{ {
opacity.value = newOpa; if (opacity.changedValue(newOpa)) {
if (filled) { if (filled.value) {
lv_obj_set_style_bg_opa(window->getLvObj(), opacity.value, LV_PART_MAIN); lv_obj_set_style_bg_opa(window->getLvObj(), opacity.value, LV_PART_MAIN);
} else { } else {
lv_obj_set_style_border_opa(window->getLvObj(), opacity.value, LV_PART_MAIN); lv_obj_set_style_bg_opa(window->getLvObj(), 0, LV_PART_MAIN);
lv_obj_set_style_border_width(window->getLvObj(), thickness, LV_PART_MAIN); lv_obj_set_style_border_opa(window->getLvObj(), opacity.value, LV_PART_MAIN);
lv_obj_set_style_border_width(window->getLvObj(), thickness, LV_PART_MAIN);
}
} }
} }
void LvglWidgetBorderedObject::refresh()
{
setFilled(filled.value);
LvglWidgetBox::refresh();
}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void LvglWidgetRoundObject::parseParam(lua_State *L, const char *key) void LvglWidgetRoundObject::parseParam(lua_State *L, const char *key)
@@ -1498,15 +1587,20 @@ void LvglWidgetRoundObject::parseParam(lua_State *L, const char *key)
bool LvglWidgetRoundObject::callRefs(lua_State *L) bool LvglWidgetRoundObject::callRefs(lua_State *L)
{ {
if (!pcallUpdate1Int(L, radius.function, [=](int val) { setRadius(val); })) if (!LvglWidgetBorderedObject::callRefs(L)) return false;
return false;
return LvglWidgetObject::callRefs(L); if (isVisible()) {
if (!pcallUpdate1Int(L, radius.function, [=](int val) { setRadius(val); }))
return false;
}
return true;
} }
void LvglWidgetRoundObject::clearRefs(lua_State *L) void LvglWidgetRoundObject::clearRefs(lua_State *L)
{ {
radius.clearRef(L); radius.clearRef(L);
LvglWidgetObject::clearRefs(L); LvglWidgetBorderedObject::clearRefs(L);
} }
void LvglWidgetRoundObject::setPos(coord_t x, coord_t y) void LvglWidgetRoundObject::setPos(coord_t x, coord_t y)
@@ -1526,6 +1620,12 @@ void LvglWidgetRoundObject::setRadius(coord_t r)
setSize(w, h); setSize(w, h);
} }
void LvglWidgetRoundObject::refresh()
{
setRadius(radius.coord);
LvglWidgetBorderedObject::refresh();
}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void LvglWidgetRectangle::parseParam(lua_State *L, const char *key) void LvglWidgetRectangle::parseParam(lua_State *L, const char *key)
@@ -1639,19 +1739,24 @@ void LvglWidgetArc::setBgEndAngle(coord_t angle)
bool LvglWidgetArc::callRefs(lua_State *L) bool LvglWidgetArc::callRefs(lua_State *L)
{ {
if (!pcallUpdate1Int(L, startAngle.function, if (!LvglWidgetRoundObject::callRefs(L)) return false;
[=](int val) { setStartAngle(val); }))
return false; if (isVisible()) {
if (!pcallUpdate1Int(L, endAngle.function, if (!pcallUpdate1Int(L, startAngle.function,
[=](int val) { setEndAngle(val); })) [=](int val) { setStartAngle(val); }))
return false; return false;
if (!pcallUpdate1Int(L, bgStartAngle.function, if (!pcallUpdate1Int(L, endAngle.function,
[=](int val) { setBgStartAngle(val); })) [=](int val) { setEndAngle(val); }))
return false; return false;
if (!pcallUpdate1Int(L, bgEndAngle.function, if (!pcallUpdate1Int(L, bgStartAngle.function,
[=](int val) { setBgEndAngle(val); })) [=](int val) { setBgStartAngle(val); }))
return false; return false;
return LvglWidgetRoundObject::callRefs(L); if (!pcallUpdate1Int(L, bgEndAngle.function,
[=](int val) { setBgEndAngle(val); }))
return false;
}
return true;
} }
void LvglWidgetArc::clearRefs(lua_State *L) void LvglWidgetArc::clearRefs(lua_State *L)
@@ -1706,19 +1811,24 @@ void LvglWidgetImage::parseParam(lua_State *L, const char *key)
bool LvglWidgetImage::callRefs(lua_State *L) bool LvglWidgetImage::callRefs(lua_State *L)
{ {
int t = lua_gettop(L); if (!LvglWidgetObject::callRefs(L)) return false;
if (filename.function != LUA_REFNIL) {
if (pcallFunc(L, filename.function, 1)) { if (isVisible()) {
const char *s = luaL_checkstring(L, -1); int t = lua_gettop(L);
if (filename.changedText(s)) { if (filename.function != LUA_REFNIL) {
((StaticImage*)window)->setSource(filename.chars()); if (pcallFunc(L, filename.function, 1)) {
const char *s = luaL_checkstring(L, -1);
if (filename.changedText(s)) {
((StaticImage*)window)->setSource(filename.chars());
}
lua_settop(L, t);
} else {
return false;
} }
lua_settop(L, t);
} else {
return false;
} }
} }
return LvglWidgetObject::callRefs(L);
return true;
} }
void LvglWidgetImage::clearRefs(lua_State *L) void LvglWidgetImage::clearRefs(lua_State *L)
@@ -1768,20 +1878,16 @@ void LvglWidgetTextButtonBase::parseParam(lua_State *L, const char *key)
bool LvglWidgetTextButtonBase::callRefs(lua_State *L) bool LvglWidgetTextButtonBase::callRefs(lua_State *L)
{ {
int t = lua_gettop(L); if (!LvglWidgetObject::callRefs(L)) return false;
if (txt.function != LUA_REFNIL) {
if (pcallFunc(L, txt.function, 1)) { if (isVisible()) {
const char *s = luaL_checkstring(L, -1); if (!pcallUpdateStringVal(L, txt.function, [=](const char* s) { setText(s); }))
setText(s); return false;
lua_settop(L, t); if (!pcallUpdate1Int(L, textColor.function, [=](int color) { setTextColor(color); }))
} else {
return false; return false;
}
} }
if (!pcallUpdate1Int(L, textColor.function,
[=](int color) { setTextColor(color); })) return true;
return false;
return LvglWidgetObject::callRefs(L);
} }
void LvglWidgetTextButtonBase::clearRefs(lua_State *L) void LvglWidgetTextButtonBase::clearRefs(lua_State *L)
@@ -2130,6 +2236,9 @@ class WidgetPage : public NavWindow, public LuaEventHandler
Window *getBody() { return body; } Window *getBody() { return body; }
void setTitle(std::string s) { header->setTitle(s); }
void setSubTitle(std::string s) { header->setTitle2(s); }
protected: protected:
std::function<void()> backAction; std::function<void()> backAction;
PageHeader *header = nullptr; PageHeader *header = nullptr;
@@ -2146,8 +2255,6 @@ class WidgetPage : public NavWindow, public LuaEventHandler
LuaEventHandler::onLuaEvent(evt); LuaEventHandler::onLuaEvent(evt);
parent->onEvent(evt); parent->onEvent(evt);
} }
protected:
}; };
void LvglWidgetPage::parseParam(lua_State *L, const char *key) void LvglWidgetPage::parseParam(lua_State *L, const char *key)
@@ -2157,7 +2264,7 @@ void LvglWidgetPage::parseParam(lua_State *L, const char *key)
if (!strcmp(key, "back")) { if (!strcmp(key, "back")) {
backActionFunction = luaL_ref(L, LUA_REGISTRYINDEX); backActionFunction = luaL_ref(L, LUA_REGISTRYINDEX);
} else if (!strcmp(key, "subtitle")) { } else if (!strcmp(key, "subtitle")) {
subtitle = luaL_checkstring(L, -1); subtitle.parse(L);
} else if (!strcmp(key, "icon")) { } else if (!strcmp(key, "icon")) {
iconFile = luaL_checkstring(L, -1); iconFile = luaL_checkstring(L, -1);
} else { } else {
@@ -2175,26 +2282,49 @@ coord_t LvglWidgetPage::getScrollY()
return lv_obj_get_scroll_y(window->getLvObj()); return lv_obj_get_scroll_y(window->getLvObj());
} }
void LvglWidgetPage::setTitle(const char* s)
{
if (page && title.changedText(s))
page->setTitle(title.txt);
}
void LvglWidgetPage::setSubTitle(const char* s)
{
if (page && subtitle.changedText(s))
page->setSubTitle(subtitle.txt);
}
bool LvglWidgetPage::callRefs(lua_State *L) bool LvglWidgetPage::callRefs(lua_State *L)
{ {
if (!pcallUpdate2Int(L, scrollToFunction, if (!LvglWidgetObject::callRefs(L)) return false;
[=](int x, int y) { if (x != getScrollX() || y != getScrollY()) lv_obj_scroll_to(window->getLvObj(), x, y, LV_ANIM_OFF); })) {
return false; if (isVisible()) {
if (!pcallUpdateStringVal(L, title.function, [=](const char* s) { setTitle(s); }))
return false;
if (!pcallUpdateStringVal(L, subtitle.function, [=](const char* s) { setSubTitle(s); }))
return false;
if (!pcallUpdate2Int(L, scrollToFunction,
[=](int x, int y) { if (x != getScrollX() || y != getScrollY()) lv_obj_scroll_to(window->getLvObj(), x, y, LV_ANIM_OFF); })) {
return false;
}
} }
return LvglWidgetObject::callRefs(L);
return true;
} }
void LvglWidgetPage::clearRefs(lua_State *L) void LvglWidgetPage::clearRefs(lua_State *L)
{ {
title.clearRef(L);
subtitle.clearRef(L);
clearRef(L, backActionFunction); clearRef(L, backActionFunction);
LvglWidgetObject::clearRefs(L); LvglWidgetObject::clearRefs(L);
} }
void LvglWidgetPage::build(lua_State *L) void LvglWidgetPage::build(lua_State *L)
{ {
auto page = new WidgetPage( page = new WidgetPage(
lvglManager->getCurrentParent(), lvglManager->getCurrentParent(),
[=]() { pcallSimpleFunc(L, backActionFunction); }, title, subtitle, iconFile, scrollDir, showScrollBar); [=]() { pcallSimpleFunc(L, backActionFunction); }, title.txt, subtitle.txt, iconFile, scrollDir, showScrollBar);
window = page->getBody(); window = page->getBody();
window->disableForcedScroll(); window->disableForcedScroll();
@@ -2239,6 +2369,7 @@ void LvglWidgetDialog::parseParam(lua_State *L, const char *key)
void LvglWidgetDialog::clearRefs(lua_State *L) void LvglWidgetDialog::clearRefs(lua_State *L)
{ {
title.clearRef(L);
clearRef(L, closeFunction); clearRef(L, closeFunction);
LvglWidgetObject::clearRefs(L); LvglWidgetObject::clearRefs(L);
} }
@@ -2247,7 +2378,7 @@ void LvglWidgetDialog::build(lua_State *L)
{ {
if (w == LV_SIZE_CONTENT) w = DIALOG_DEFAULT_WIDTH; if (w == LV_SIZE_CONTENT) w = DIALOG_DEFAULT_WIDTH;
if (h == LV_SIZE_CONTENT) h = DIALOG_DEFAULT_HEIGHT; if (h == LV_SIZE_CONTENT) h = DIALOG_DEFAULT_HEIGHT;
auto dlg = new LvglDialog(title, w, h, auto dlg = new LvglDialog(title.txt, w, h,
[=]() { pcallSimpleFunc(L, closeFunction); }); [=]() { pcallSimpleFunc(L, closeFunction); });
dialog = dlg; dialog = dlg;
window = dlg->getBody(); window = dlg->getBody();
@@ -2278,6 +2409,7 @@ void LvglWidgetConfirmDialog::parseParam(lua_State *L, const char *key)
void LvglWidgetConfirmDialog::clearRefs(lua_State *L) void LvglWidgetConfirmDialog::clearRefs(lua_State *L)
{ {
title.clearRef(L);
clearRef(L, confirmFunction); clearRef(L, confirmFunction);
clearRef(L, cancelFunction); clearRef(L, cancelFunction);
LvglWidgetObject::clearRefs(L); LvglWidgetObject::clearRefs(L);
@@ -2285,7 +2417,7 @@ void LvglWidgetConfirmDialog::clearRefs(lua_State *L)
void LvglWidgetConfirmDialog::build(lua_State *L) void LvglWidgetConfirmDialog::build(lua_State *L)
{ {
window = new ConfirmDialog(title.c_str(), message.c_str(), window = new ConfirmDialog(title.txt.c_str(), message.c_str(),
[=]() { pcallSimpleFunc(L, confirmFunction); }, [=]() { pcallSimpleFunc(L, confirmFunction); },
[=]() { pcallSimpleFunc(L, cancelFunction); }); [=]() { pcallSimpleFunc(L, cancelFunction); });
} }
@@ -2303,9 +2435,15 @@ void LvglWidgetMessageDialog::parseParam(lua_State *L, const char *key)
} }
} }
void LvglWidgetMessageDialog::clearRefs(lua_State *L)
{
title.clearRef(L);
LvglWidgetObject::clearRefs(L);
}
void LvglWidgetMessageDialog::build(lua_State *L) void LvglWidgetMessageDialog::build(lua_State *L)
{ {
window = new MessageDialog(title.c_str(), message.c_str(), details.c_str()); window = new MessageDialog(title.txt.c_str(), message.c_str(), details.c_str());
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -2340,6 +2478,7 @@ void LvglWidgetChoice::parseParam(lua_State *L, const char *key)
void LvglWidgetChoice::clearRefs(lua_State *L) void LvglWidgetChoice::clearRefs(lua_State *L)
{ {
title.clearRef(L);
clearRef(L, filterFunction); clearRef(L, filterFunction);
LvglWidgetPicker::clearRefs(L); LvglWidgetPicker::clearRefs(L);
} }
@@ -2350,7 +2489,7 @@ void LvglWidgetChoice::build(lua_State *L)
auto c = new Choice( auto c = new Choice(
lvglManager->getCurrentParent(), {x, y, w, h}, values, 0, values.size() - 1, lvglManager->getCurrentParent(), {x, y, w, h}, values, 0, values.size() - 1,
[=]() { return pcallGetIntVal(L, getFunction) - 1; }, [=]() { return pcallGetIntVal(L, getFunction) - 1; },
[=](int val) { pcallSetIntVal(L, setFunction, val + 1); }, title.c_str()); [=](int val) { pcallSetIntVal(L, setFunction, val + 1); }, title.txt.c_str());
c->setPopupWidth(popupWidth); c->setPopupWidth(popupWidth);
@@ -2390,10 +2529,16 @@ void LvglWidgetMenu::parseParam(lua_State *L, const char *key)
LvglWidgetPicker::parseParam(L, key); LvglWidgetPicker::parseParam(L, key);
} }
void LvglWidgetMenu::clearRefs(lua_State *L)
{
title.clearRef(L);
LvglWidgetPicker::clearRefs(L);
}
void LvglWidgetMenu::build(lua_State *L) void LvglWidgetMenu::build(lua_State *L)
{ {
auto menu = new Menu(); auto menu = new Menu();
if (!title.empty()) menu->setTitle(title); if (!title.txt.empty()) menu->setTitle(title.txt);
for (size_t i = 0; i < values.size(); i += 1) { for (size_t i = 0; i < values.size(); i += 1) {
menu->addLine(values[i], [=]() { menu->addLine(values[i], [=]() {
@@ -2534,6 +2679,12 @@ void LvglWidgetFilePicker::parseParam(lua_State *L, const char *key)
} }
} }
void LvglWidgetFilePicker::clearRefs(lua_State *L)
{
title.clearRef(L);
LvglWidgetPicker::clearRefs(L);
}
void LvglWidgetFilePicker::build(lua_State *L) void LvglWidgetFilePicker::build(lua_State *L)
{ {
if (h == LV_SIZE_CONTENT) h = 0; if (h == LV_SIZE_CONTENT) h = 0;
@@ -2542,7 +2693,7 @@ void LvglWidgetFilePicker::build(lua_State *L)
folder.c_str(), extension.c_str(), maxLen, folder.c_str(), extension.c_str(), maxLen,
[=]() { return pcallGetStringVal(L, getFunction); }, [=]() { return pcallGetStringVal(L, getFunction); },
[=](std::string val) { pcallSetStringVal(L, setFunction, val.c_str()); }, [=](std::string val) { pcallSetStringVal(L, setFunction, val.c_str()); },
hideExtension, title.c_str()); hideExtension, title.txt.c_str());
window = c; window = c;
} }
+28 -11
View File
@@ -39,7 +39,7 @@ struct LvglParamFuncOrValue
uint32_t value; uint32_t value;
}; };
uint32_t currVal = -1; uint32_t currVal = -1;
void parse(lua_State *L); void parse(lua_State *L);
void forceUpdate() { currVal = -1; } void forceUpdate() { currVal = -1; }
@@ -54,7 +54,7 @@ struct LvglParamFuncOrString
public: public:
int function; int function;
std::string txt; std::string txt;
uint32_t txtHash = -1; uint32_t txtHash = -1;
void parse(lua_State *L); void parse(lua_State *L);
void forceUpdate() { txtHash = -1; } void forceUpdate() { txtHash = -1; }
@@ -111,7 +111,7 @@ class LvglTitleParam
LvglTitleParam() {} LvglTitleParam() {}
protected: protected:
std::string title; LvglParamFuncOrString title = { .function = LUA_REFNIL, .txt = ""};
bool parseTitleParam(lua_State *L, const char *key); bool parseTitleParam(lua_State *L, const char *key);
}; };
@@ -192,6 +192,7 @@ class LvglWidgetObjectBase
virtual void show() = 0; virtual void show() = 0;
virtual void hide() = 0; virtual void hide() = 0;
virtual bool isVisible() = 0;
virtual void enable() {}; virtual void enable() {};
virtual void disable() {}; virtual void disable() {};
virtual void close() {}; virtual void close() {};
@@ -240,6 +241,7 @@ class LvglWidgetObjectBase
std::function<void(int)> update); std::function<void(int)> update);
bool pcallUpdate2Int(lua_State *L, int getFuncRef, bool pcallUpdate2Int(lua_State *L, int getFuncRef,
std::function<void(int, int)> update); std::function<void(int, int)> update);
bool pcallUpdateStringVal(lua_State *L, int getFuncRef, std::function<void(const char*)> update);
int pcallGetIntVal(lua_State *L, int getFuncRef); int pcallGetIntVal(lua_State *L, int getFuncRef);
int pcallGetOptIntVal(lua_State *L, int getFuncRef, int defVal); int pcallGetOptIntVal(lua_State *L, int getFuncRef, int defVal);
void pcallSetIntVal(lua_State *L, int setFuncRef, int val); void pcallSetIntVal(lua_State *L, int setFuncRef, int val);
@@ -256,6 +258,7 @@ class LvglSimpleWidgetObject : public LvglWidgetObjectBase
void show() override; void show() override;
void hide() override; void hide() override;
bool isVisible() override;
void setPos(coord_t x, coord_t y) override; void setPos(coord_t x, coord_t y) override;
void setSize(coord_t w, coord_t h) override; void setSize(coord_t w, coord_t h) override;
@@ -413,6 +416,7 @@ class LvglWidgetObject : public LvglWidgetObjectBase
void show() override { window->show(); } void show() override { window->show(); }
void hide() override { window->hide(); } void hide() override { window->hide(); }
bool isVisible() override { return window->isVisible(); }
void enable() override { window->enable(); } void enable() override { window->enable(); }
void disable() override { window->disable(); } void disable() override { window->disable(); }
@@ -475,11 +479,16 @@ class LvglWidgetBorderedObject : public LvglWidgetBox, public LvglThicknessParam
void setColor(LcdFlags newColor) override; void setColor(LcdFlags newColor) override;
void setOpacity(uint8_t newOpa) override; void setOpacity(uint8_t newOpa) override;
void setFilled(int newVal);
bool callRefs(lua_State *L) override;
void clearRefs(lua_State *L) override;
protected: protected:
bool filled = false; LvglParamFuncOrValue filled = { .function = LUA_REFNIL, .value = false};
void parseParam(lua_State *L, const char *key) override; void parseParam(lua_State *L, const char *key) override;
void refresh() override;
}; };
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -502,11 +511,7 @@ class LvglWidgetRoundObject : public LvglWidgetBorderedObject
LvglParamFuncOrValue radius = { .function = LUA_REFNIL, .coord = 0}; LvglParamFuncOrValue radius = { .function = LUA_REFNIL, .coord = 0};
void parseParam(lua_State *L, const char *key) override; void parseParam(lua_State *L, const char *key) override;
void refresh() override void refresh() override;
{
setRadius(radius.coord);
LvglWidgetObject::refresh();
}
}; };
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -780,6 +785,8 @@ class LvglWidgetVerticalSlider : public LvglWidgetSliderBase
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
class WidgetPage;
class LvglWidgetPage : public LvglWidgetObject, public LvglTitleParam, public LvglScrollableParams class LvglWidgetPage : public LvglWidgetObject, public LvglTitleParam, public LvglScrollableParams
{ {
public: public:
@@ -791,9 +798,13 @@ class LvglWidgetPage : public LvglWidgetObject, public LvglTitleParam, public Lv
coord_t getScrollX() override; coord_t getScrollX() override;
coord_t getScrollY() override; coord_t getScrollY() override;
void setTitle(const char* s);
void setSubTitle(const char* s);
protected: protected:
std::string subtitle; LvglParamFuncOrString subtitle = { .function = LUA_REFNIL, .txt = ""};
std::string iconFile; std::string iconFile;
WidgetPage* page = nullptr;
int backActionFunction = LUA_REFNIL; int backActionFunction = LUA_REFNIL;
@@ -844,6 +855,8 @@ class LvglWidgetMessageDialog : public LvglWidgetObject, public LvglTitleParam,
public: public:
LvglWidgetMessageDialog() : LvglWidgetObject(LVGL_SIMPLEMETATABLE) {} LvglWidgetMessageDialog() : LvglWidgetObject(LVGL_SIMPLEMETATABLE) {}
void clearRefs(lua_State *L) override;
protected: protected:
std::string details; std::string details;
@@ -888,6 +901,8 @@ class LvglWidgetMenu : public LvglWidgetPicker, public LvglTitleParam, public Lv
public: public:
LvglWidgetMenu() : LvglWidgetPicker() {} LvglWidgetMenu() : LvglWidgetPicker() {}
void clearRefs(lua_State *L) override;
protected: protected:
void build(lua_State *L) override; void build(lua_State *L) override;
void parseParam(lua_State *L, const char *key) override; void parseParam(lua_State *L, const char *key) override;
@@ -970,7 +985,9 @@ class LvglWidgetSourcePicker : public LvglWidgetPicker
class LvglWidgetFilePicker : public LvglWidgetPicker, public LvglTitleParam class LvglWidgetFilePicker : public LvglWidgetPicker, public LvglTitleParam
{ {
public: public:
LvglWidgetFilePicker() : LvglWidgetPicker() {} LvglWidgetFilePicker() : LvglWidgetPicker() {}
void clearRefs(lua_State *L) override;
protected: protected:
std::string folder; std::string folder;
+1 -1
View File
@@ -337,7 +337,7 @@ void guiMain(event_t evt)
maxLuaInterval = interval; maxLuaInterval = interval;
} }
luaDoGc(lsWidgets, true); luaDoGc(lsWidgets, false);
DEBUG_TIMER_START(debugTimerLua); DEBUG_TIMER_START(debugTimerLua);
luaTask(false); luaTask(false);