css changes for list and tree components

eez-open · Dec 6, 2024 · cc0a139 · cc0a139
1 parent a4e6116
commit cc0a139
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 13 deletions.
diff --git a/packages/eez-studio-ui/_stylesheets/app.less b/packages/eez-studio-ui/_stylesheets/app.less
@@ -1083,6 +1083,7 @@ button.EezStudio_Action {
         display: flex;
         white-space: nowrap;
         position: relative;
+        border-radius: 3px;
 
         &.drag-source {
             background-color: @dragSourceBackgroundColor;

diff --git a/packages/eez-studio-ui/_stylesheets/project-editor.less b/packages/eez-studio-ui/_stylesheets/project-editor.less
@@ -3822,5 +3822,5 @@
     color: rgb(238, 238, 238);
     background-color: var(--bs-secondary);
     white-space: nowrap;
-    border-radius: var(--bs-border-radius);
+    border-radius: 4px;
 }
diff --git a/packages/project-editor/features/variable/variable.tsx b/packages/project-editor/features/variable/variable.tsx
@@ -24,15 +24,17 @@ import {
     IMessage,
     PropertyInfo,
     getProperty,
-    PropertyProps
+    PropertyProps,
+    isPropertyDisabled
 } from "project-editor/core/object";
 import {
     getChildOfObject,
     Message,
     propertyNotSetMessage,
     createObject,
     isEezObjectArray,
-    getAncestorOfType
+    getAncestorOfType,
+    findPropertyByNameInObject
 } from "project-editor/store";
 import {
     isDashboardProject,
@@ -470,7 +472,8 @@ export class Variable extends EezObject {
                             ProjectEditor.getProjectStore(variable),
                             variable.type
                         )?.editConstructorParams) ||
-                    variable.type == "object:TCPSocket"
+                    variable.type == "object:TCPSocket",
+                checkboxStyleSwitch: true
             },
             {
                 name: "persistedValue",
@@ -487,8 +490,6 @@ export class Variable extends EezObject {
         ],
         icon: VARIABLE_ICON,
         listLabel: (variable: Variable) => {
-            const projectStore = getProjectStore(variable);
-
             return (
                 <>
                     <span>{variable.name}</span>
@@ -498,17 +499,24 @@ export class Variable extends EezObject {
                     >
                         {variable.type}
                     </em>
-                    {projectStore.projectTypeTraits.hasFlowSupport &&
+                    {!isPropertyDisabled(
+                        variable,
+                        findPropertyByNameInObject(variable, "native")!
+                    ) &&
                         variable.native && (
                             <span className="EezStudio_ListLabel_Badge">
                                 NATIVE
                             </span>
                         )}
-                    {variable.persistent && (
-                        <span className="EezStudio_ListLabel_Badge">
-                            PERSISTENT
-                        </span>
-                    )}
+                    {!isPropertyDisabled(
+                        variable,
+                        findPropertyByNameInObject(variable, "persistent")!
+                    ) &&
+                        variable.persistent && (
+                            <span className="EezStudio_ListLabel_Badge">
+                                PERSISTENT
+                            </span>
+                        )}
                 </>
             );
         },

diff --git a/packages/project-editor/lvgl/widgets/Label.tsx b/packages/project-editor/lvgl/widgets/Label.tsx
@@ -90,7 +90,8 @@ export class LVGLLabelWidget extends LVGLWidget {
             {
                 name: "recolor",
                 type: PropertyType.Boolean,
-                propertyGridGroup: specificGroup
+                propertyGridGroup: specificGroup,
+                checkboxStyleSwitch: true
             }
         ],