优化图标显示

ipuppet · Jul 8, 2024 · a6cd6c1 · a6cd6c1
1 parent abca238
commit a6cd6c1
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 24 deletions.
diff --git a/config.json b/config.json
@@ -1,7 +1,7 @@
 {
     "info": {
         "name": "CAIO",
-        "version": "2.3.1",
+        "version": "2.3.2",
         "author": "ipuppet",
         "module": false
     },

diff --git a/dist/CAIO.json b/dist/CAIO.json
diff --git a/scripts/libs/easy-jsbox.js b/scripts/libs/easy-jsbox.js
diff --git a/scripts/widget/Actions.js b/scripts/widget/Actions.js
@@ -47,16 +47,19 @@ class ActionsWidget {
                 frame: {
                     width: size,
                     height: size
-                }
+                },
+                resizable: true
             }
         }
         if (action.icon.startsWith("icon_")) {
-            // TODO: 优化 icon_ 的处理
-            // view.props.image = $icon(
-            //     action.icon?.slice(5, action.icon.indexOf(".")),
-            //     $color("#ffffff"),
-            //     $size(size, size)
-            // )
+            view.props.image = $icon(
+                action.icon?.slice(5, action.icon.indexOf(".")),
+                $color("#ffffff"),
+                $size(size, size)
+            )
+                .ocValue()
+                .$image()
+                .jsValue()
         } else if (action.icon.indexOf("/") > -1) {
             view.props.image = $image(action.icon)
         } else {
@@ -94,7 +97,7 @@ class ActionsWidget {
                             type: "hstack",
                             modifiers: [
                                 {
-                                    background: $color(action.color),
+                                    background: this.kernel.actions.views.getColor(action.color),
                                     frame: {
                                         width: 50,
                                         height: 50
@@ -107,18 +110,7 @@ class ActionsWidget {
                                     }
                                 }
                             ],
-                            views: [
-                                {
-                                    type: "image",
-                                    props: {
-                                        symbol: {
-                                            glyph: action.icon,
-                                            size: 50 * 0.6
-                                        },
-                                        color: $color("#ffffff")
-                                    }
-                                }
-                            ]
+                            views: [this.getIcon(action, 50 * 0.6)]
                         }
                     ]
                 },
@@ -196,7 +188,7 @@ class ActionsWidget {
                             type: "hstack",
                             modifiers: [
                                 {
-                                    background: $color(action.color),
+                                    background: this.kernel.actions.views.getColor(action.color),
                                     frame: {
                                         width: itemHeight,
                                         height: itemHeight