Button can display icon

rexrainbow · Oct 10, 2023 · a8b6fa9 · a8b6fa9
1 parent b443efa
commit a8b6fa9
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/examples/ui-tweaker/buttons.js b/examples/ui-tweaker/buttons.js
@@ -23,7 +23,12 @@ class Demo extends Phaser.Scene {
             .addButton({
                 title: 'Button A',
 
-                label: 'Button A',
+                // label: 'Button A',
+                label: {
+                    text: 'Button A',
+                    icon: 'settings',
+                    iconSize: 20
+                },
                 callback: function () {
                     print.text += 'Click Button A\n';
                 }

diff --git a/templates/ui/simplelabel/SimpleLabel.d.ts b/templates/ui/simplelabel/SimpleLabel.d.ts
@@ -9,6 +9,9 @@ declare namespace SimpleLabel {
 
     interface ICreatorsConfig extends BuildLabelConfig.ICreators {
     }
+
+    interface IResetDisplayContentConfig extends Label.IResetDisplayContentConfig {
+    }
 }
 
 declare class SimpleLabel extends Label {

diff --git a/templates/ui/tweaker/Tweaker.d.ts b/templates/ui/tweaker/Tweaker.d.ts
@@ -85,6 +85,10 @@ declare namespace Tweaker {
         }
     }
 
+    interface IOptionConfig extends SimpleLabel.IResetDisplayContentConfig {
+        value: any
+    }
+
     interface IConfig extends Sizer.IConfig {
         styles: {
             itemWidth?: number,
@@ -143,10 +147,7 @@ declare namespace Tweaker {
         min?: number, max?: number,
 
         // list, buttons
-        options?: {
-            text: string,
-            value: any
-        }[],
+        options?: IOptionConfig[],
 
         format: (value?: any) => string,
 
@@ -176,7 +177,7 @@ declare namespace Tweaker {
 
         title: string,
 
-        label: string,
+        label: string | SimpleLabel.IResetDisplayContentConfig,
         callback: (bindingTarget: Object) => void,
 
         key?: string,
@@ -192,7 +193,7 @@ declare namespace Tweaker {
         title: string,
 
         buttons: {
-            label: string,
+            label: string | SimpleLabel.IResetDisplayContentConfig,
             callback: (bindingTarget: Object) => void,
         }[],
 

diff --git a/templates/ui/tweaker/builders/CreateButtons.js b/templates/ui/tweaker/builders/CreateButtons.js
@@ -20,9 +20,7 @@ var CreateButtons = function (scene, config, style) {
         buttons.push(button);
 
         var buttonConfig = buttonsConfig[i];
-        button.resetDisplayContent({
-            text: buttonConfig.label
-        })
+        button.resetDisplayContent(buttonConfig.label);
         button.callback = buttonConfig.callback;
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,9 @@ declare namespace SimpleLabel { @@
         interface ICreatorsConfig extends BuildLabelConfig.ICreators {
         }
+        interface IResetDisplayContentConfig extends Label.IResetDisplayContentConfig {
+        }
     }
     declare class SimpleLabel extends Label {
@@ Expand Down @@