Fixed: [LVGL] Style preview for Screen doesn't show colors #642

eez-open · Nov 19, 2024 · 7c2177f · 7c2177f
1 parent 16bb20c
commit 7c2177f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 19 deletions.
diff --git a/packages/project-editor/features/style/theme.tsx b/packages/project-editor/features/style/theme.tsx
@@ -684,7 +684,7 @@ function getThemedColorInProject(
 }
 
 export function getThemedColor(projectStore: ProjectStore, colorValue: string) {
-    if (colorValue.startsWith("#")) {
+    if (typeof colorValue != "string" || colorValue.startsWith("#")) {
         return { colorValue, isFromTheme: false };
     }
 

diff --git a/packages/project-editor/lvgl/page-runtime.ts b/packages/project-editor/lvgl/page-runtime.ts
@@ -442,7 +442,7 @@ export abstract class LVGLPageRuntime {
     }
 
     getThemedColor(colorValue: string) {
-        if (colorValue.startsWith("#")) {
+        if (typeof colorValue != "string" || colorValue.startsWith("#")) {
             return { colorValue, isFromTheme: false };
         }
 
@@ -1313,6 +1313,8 @@ export class LVGLStylesEditorRuntime extends LVGLPageRuntime {
                 10
             );
 
+        this.lvglWidgetsMap.set(lvglScreenWidget.type, lvglScreenWidget);
+
         for (const component of lvglScreenWidget.children) {
             this.lvglWidgetsMap.set(component.type, component);
         }
@@ -1418,27 +1420,13 @@ export class LVGLStylesEditorRuntime extends LVGLPageRuntime {
                                 lvglWidget._useStyleForStylePreview = "";
                                 lvglWidget.states = "";
 
-                                flags.push("HIDDEN");
+                                if (lvglWidget != this.page.lvglScreenWidget) {
+                                    flags.push("HIDDEN");
+                                }
                             }
 
                             lvglWidget.widgetFlags = flags.join("|");
                         }
-
-                        const lvglScreenWidget = this.page.lvglScreenWidget!;
-                        if (
-                            this.selectedStyle &&
-                            this.canvas &&
-                            lvglScreenWidget.type ==
-                                this.selectedStyle.forWidgetType
-                        ) {
-                            lvglScreenWidget._useStyleForStylePreview =
-                                this.selectedStyle.name;
-                            lvglScreenWidget.states =
-                                this.project._store.uiStateStore.lvglState;
-                        } else {
-                            lvglScreenWidget._useStyleForStylePreview = "";
-                            lvglScreenWidget.states = "";
-                        }
                     });
 
                     const pageObj = this.lvglCreatePage();