Allow any full screen widget to use all controls.

EdgeTX · Jan 20, 2025 · 8c1ec75 · 8c1ec75
1 parent dbf59f2
commit 8c1ec75
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/radio/src/lua/api_colorlcd_lvgl.cpp b/radio/src/lua/api_colorlcd_lvgl.cpp
@@ -185,7 +185,7 @@ static void buildLvgl(lua_State *L, int srcIndex, int refIndex)
       obj = new LvglWidgetBox();
     else if (strcasecmp(p.type, "setting") == 0)
       obj = new LvglWidgetSetting();
-    else if (!luaLvglManager->isWidget() || (luaLvglManager->isAppMode() && luaLvglManager->isFullscreen())) {
+    else if (luaLvglManager->isFullscreen()) {
       if (strcasecmp(p.type, "button") == 0)
         obj = new LvglWidgetTextButton();
       else if (strcasecmp(p.type, "toggle") == 0)

diff --git a/radio/src/lua/lua_lvgl_widget.cpp b/radio/src/lua/lua_lvgl_widget.cpp
@@ -1733,6 +1733,7 @@ void LvglWidgetAlignPicker::build(lua_State *L)
 
 void LvglWidgetColorPicker::build(lua_State *L)
 {
+  if (w == LV_SIZE_CONTENT) w = 0;
   if (h == LV_SIZE_CONTENT) h = 0;
   window = new ColorPicker(
       lvglManager->getCurrentParent(), {x, y, w, h},