From c7b2e6dd30b64cac1ed2a1add7d514b4c7507482 Mon Sep 17 00:00:00 2001
From: unanmed <1319491857@qq.com>
Date: Sun, 12 Jan 2025 14:16:52 +0800
Subject: [PATCH] refactor: Winskin.image

---
 src/core/render/preset/misc.ts    | 30 ++++++++++++++++++++++++++++--
 src/core/render/renderer/props.ts |  4 ++--
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/src/core/render/preset/misc.ts b/src/core/render/preset/misc.ts
index e93290b..c9f5912 100644
--- a/src/core/render/preset/misc.ts
+++ b/src/core/render/preset/misc.ts
@@ -278,7 +278,7 @@ export class Icon extends RenderItem<EIconEvent> implements IAnimateFrame {
             if (isNil(this.pendingIcon)) {
                 loading.once('loaded', () => {
                     this.setIconRenderable(this.pendingIcon ?? 0);
-                    this.pendingIcon = void 0;
+                    delete this.pendingIcon;
                 });
             }
             this.pendingIcon = num;
@@ -346,6 +346,8 @@ export class Winskin extends RenderItem<EWinskinEvent> {
     /** 边框宽度 */
     borderSize: number = 32;
 
+    private pendingImage?: ImageIds;
+
     constructor(
         image: SizedCanvasImageSource,
         type: RenderItemPosition = 'static'
@@ -507,6 +509,29 @@ export class Winskin extends RenderItem<EWinskinEvent> {
         this.update();
     }
 
+    /**
+     * 通过图片名称设置winskin
+     * @param name 图片名称
+     */
+    setImageByName(name: ImageIds) {
+        const loading = Mota.require('var', 'loading');
+        if (loading.loaded) {
+            const image = core.material.images.images[name];
+            this.setImage(image);
+        } else {
+            if (isNil(this.pendingImage)) {
+                loading.once('loaded', () => {
+                    const id = this.pendingImage;
+                    if (!id) return;
+                    const image = core.material.images.images[id];
+                    this.setImage(image);
+                    delete this.pendingImage;
+                });
+            }
+            this.pendingImage = name;
+        }
+    }
+
     /**
      * 设置边框大小
      * @param size 边框大小
@@ -525,7 +550,8 @@ export class Winskin extends RenderItem<EWinskinEvent> {
     ): void {
         switch (key) {
             case 'image':
-                this.setImage(nextValue);
+                if (!this.assertType(nextValue, 'string', key)) return;
+                this.setImageByName(nextValue);
                 return;
             case 'borderSize':
                 if (!this.assertType(nextValue, 'number', key)) return;
diff --git a/src/core/render/renderer/props.ts b/src/core/render/renderer/props.ts
index e57777c..c71fe3d 100644
--- a/src/core/render/renderer/props.ts
+++ b/src/core/render/renderer/props.ts
@@ -183,6 +183,6 @@ export interface IconProps extends BaseProps {
 }
 
 export interface WinskinProps extends BaseProps {
-    image: SizedCanvasImageSource;
-    borderSize: number;
+    image: ImageIds;
+    borderSize?: number;
 }