Add setupCallback

rexrainbow · Sep 23, 2023 · b3b1ab6 · b3b1ab6
1 parent aa95cea
commit b3b1ab6
Show file tree

Hide file tree

Showing 16 changed files with 81 additions and 152 deletions.
diff --git a/templates/ui/tweaker/builders/CreateButtonsInput.js b/templates/ui/tweaker/builders/CreateButtonsInput.js
@@ -4,8 +4,6 @@ var CreateButtonsInput = function (scene, config, style) {
     var gameObject = new ButtonsInput(scene, style);
     scene.add.existing(gameObject);
 
-    gameObject.setOptions(config.options);
-
     return gameObject;
 }
 

diff --git a/templates/ui/tweaker/builders/CreateListInput.js b/templates/ui/tweaker/builders/CreateListInput.js
@@ -4,8 +4,6 @@ var CreateListInput = function (scene, config, style) {
     var gameObject = new ListInput(scene, style);
     scene.add.existing(gameObject);
 
-    gameObject.setOptions(config.options);
-
     return gameObject;
 }
 

diff --git a/templates/ui/tweaker/builders/CreateNumberInput.js b/templates/ui/tweaker/builders/CreateNumberInput.js
@@ -4,8 +4,6 @@ var CreateNumberInput = function (scene, config, style) {
     var gameObject = new NumberInput(scene, style);
     scene.add.existing(gameObject);
 
-    gameObject.setInputTextReadOnly(!!config.inputTextReadOnly);
-
     return gameObject;
 }
 

diff --git a/templates/ui/tweaker/builders/CreateRangeInput.js b/templates/ui/tweaker/builders/CreateRangeInput.js
@@ -4,9 +4,6 @@ var CreateRangeInput = function (scene, config, style) {
     var gameObject = new RangeInput(scene, style);
     scene.add.existing(gameObject);
 
-    gameObject.setRange(config.min, config.max, config.step);
-    gameObject.setInputTextReadOnly(!!config.inputTextReadOnly);
-
     return gameObject;
 }
 

diff --git a/templates/ui/tweaker/builders/CreateTextAreaInput.js b/templates/ui/tweaker/builders/CreateTextAreaInput.js
@@ -4,8 +4,6 @@ var CreateTextAreaInput = function (scene, config, style) {
     var gameObject = new TextAreaInput(scene, style);
     scene.add.existing(gameObject);
 
-    gameObject.setInputTextReadOnly(!!config.inputTextReadOnly);
-
     return gameObject;
 }
 

diff --git a/templates/ui/tweaker/builders/CreateTextInput.js b/templates/ui/tweaker/builders/CreateTextInput.js
@@ -4,8 +4,6 @@ var CreateTextInput = function (scene, config, style) {
     var gameObject = new TextInput(scene, style);
     scene.add.existing(gameObject);
 
-    gameObject.setInputTextReadOnly(!!config.inputTextReadOnly);
-
     return gameObject;
 }
 

diff --git a/templates/ui/tweaker/gameobjects/inputfield/ButtonsInput.js b/templates/ui/tweaker/gameobjects/inputfield/ButtonsInput.js
@@ -44,28 +44,18 @@ class ButtonsInput extends InputFiledBase {
             this.setValue(option.value);
             this._selectedIndex = undefined;
         }, this);
-
-    }
-
-    get value() {
-        return this._value;
-    }
-
-    set value(value) {
-        if (this._value === value) {
-            return;
-        }
-        if (!this.validate(value)) {
-            value = this._value;  // Back to previous value
+
+        this.setValueCallback = function(gameObject, value) {
+            var index = this._selectedIndex;  // See list's 'button.click' event
+            if (index === undefined) {
+                index = GetOptionIndex(list.options, value);
+            }
+            SetButtonsActiveStateByIndex(list.childrenMap.buttons, index);
         }
 
-        var list = this.childrenMap.list;
-        var index = this._selectedIndex;  // See list's 'button.click' event
-        if (index === undefined) {
-            index = GetOptionIndex(list.options, value);
+        this.setupCallback = function(gameObject, config) {
+            gameObject.setOptions(config.options);
         }
-        SetButtonsActiveStateByIndex(list.childrenMap.buttons, index);
-        super.value = value;  // Fire 'valuechange' event
     }
 
     setOptions(options) {

diff --git a/templates/ui/tweaker/gameobjects/inputfield/CheckboxInput.js b/templates/ui/tweaker/gameobjects/inputfield/CheckboxInput.js
@@ -31,22 +31,10 @@ class CheckboxInput extends InputFiledBase {
         checkbox.on('valuechange', function (value) {
             this.setValue(value);
         }, this);
-    }
-
-    get value() {
-        return this._value;
-    }
 
-    set value(value) {
-        if (this._value === value) {
-            return;
+        this.setValueCallback = function(gameObject, value) {
+            checkbox.setValue(value);
         }
-        if (!this.validate(value)) {
-            value = this._value;  // Back to previous value
-        }
-
-        this.childrenMap.checkbox.setValue(value);
-        super.value = value;  // Fire 'valuechange' event
     }
 }
 

diff --git a/templates/ui/tweaker/gameobjects/inputfield/ColorInput.js b/templates/ui/tweaker/gameobjects/inputfield/ColorInput.js
@@ -23,22 +23,10 @@ class ColorInput extends InputFiledBase {
         colorInput.on('valuechange', function (value) {
             this.setValue(value);
         }, this);
-    }
-
-    get value() {
-        return this._value;
-    }
 
-    set value(value) {
-        if (this._value === value) {
-            return;
+        this.setValueCallback = function(gameObject, value) {
+            colorInput.setValue(value);
         }
-        if (!this.validate(value)) {
-            value = this._value;  // Back to previous value
-        }
-
-        this.childrenMap.colorInput.setValue(value);
-        super.value = value;  // Fire 'valuechange' event
     }
 }
 

diff --git a/templates/ui/tweaker/gameobjects/inputfield/InputFieldBase.js b/templates/ui/tweaker/gameobjects/inputfield/InputFieldBase.js
@@ -20,8 +20,27 @@ class InputFiledBase extends Sizer {
         return this.validateCallback(newValue, this._value, this.bindingTarget, this.bindingKey);
     }
 
-    // Override
+    getFotmatText(value) {
+        if (this.textFormatCallback) {
+            value = this.textFormatCallback(value);
+        } else {
+            value = value.toString();
+        }
+        return value;
+    }
+
     set value(value) {
+        if (this._value === value) {
+            return;
+        }
+        if (!this.validate(value)) {
+            value = this._value;  // Back to previous value
+        }
+
+        if (this.setValueCallback) {
+            this.setValueCallback(this, value)
+        }
+
         if (this._value === value) {
             return;
         }
@@ -57,12 +76,25 @@ class InputFiledBase extends Sizer {
     }
 
     setup(config) {
-        this.textFormatCallback = config.format;
-        this.validateCallback = config.onValidate;
+        this.setTextFormatCallback(config.format);
+        this.setValidateCallback(config.onValidate);
+
+        if (this.setupCallback) {
+            this.setupCallback(this, config)
+        }
+
+        return this;
+    }
 
+    setTextFormatCallback(callback) {
+        this.textFormatCallback = callback;
         return this;
     }
 
+    setValidateCallback(callback) {
+        this.validateCallback = callback;
+        return this;
+    }
 }
 
 export default InputFiledBase;
diff --git a/templates/ui/tweaker/gameobjects/inputfield/ListInput.js b/templates/ui/tweaker/gameobjects/inputfield/ListInput.js
@@ -21,28 +21,18 @@ class ListInput extends InputFiledBase {
 
         this.addChildrenMap('list', list);
 
-        list.on('button.click', function (dropDownList, listPanel, button, index, pointer, event) {           
+        list.on('button.click', function (dropDownList, listPanel, button, index, pointer, event) {
             this.setValue(button.value);
         }, this);
 
-    }
-
-    get value() {
-        return this._value;
-    }
-
-    set value(value) {
-        if (this._value === value) {
-            return;
-        }
-        if (!this.validate(value)) {
-            value = this._value;  // Back to previous value
+        this.setValueCallback = function (gameObject, value) {
+            var text = GetOptionText(list.options, value);
+            list.resetDisplayContent({ text: text });
         }
 
-        var list = this.childrenMap.list;
-        var text = GetOptionText(list.options, value);
-        list.resetDisplayContent({ text: text });
-        super.value = value;  // Fire 'valuechange' event
+        this.setupCallback = function(gameObject, config) {
+            gameObject.setOptions(config.options);
+        }
     }
 
     setOptions(options) {

diff --git a/templates/ui/tweaker/gameobjects/inputfield/NumberInput.js b/templates/ui/tweaker/gameobjects/inputfield/NumberInput.js
@@ -24,23 +24,14 @@ class NumberInput extends InputFiledBase {
         inputText.on('close', function () {
             this.setValue(inputText.value);
         }, this);
-    }
-
-    get value() {
-        return this._value;
-    }
 
-    set value(value) {
-        if (this._value === value) {
-            return;
-        }
-        if (!this.validate(value)) {
-            value = this._value;  // Back to previous value
+        this.setValueCallback = function (gameObject, value) {
+            inputText.setText(gameObject.getFotmatText(value));
         }
 
-        var text = (this.textFormatCallback) ? this.textFormatCallback(value) : value;
-        this.childrenMap.inputText.setText(text);
-        super.value = value;  // Fire 'valuechange' event
+        this.setupCallback = function(gameObject, config) {
+            gameObject.setInputTextReadOnly(!!config.inputTextReadOnly);
+        }
     }
 
     setInputTextReadOnly(enable) {

diff --git a/templates/ui/tweaker/gameobjects/inputfield/RangeInput.js b/templates/ui/tweaker/gameobjects/inputfield/RangeInput.js
@@ -54,25 +54,17 @@ class RangeInput extends InputFiledBase {
             this.setValue(value);
         }, this);
 
-    }
-
-    get value() {
-        return this._value;
-    }
-
-    set value(value) {
-        if (this._value === value) {
-            return;
-        }
-        if (!this.validate(value)) {
-            value = this._value;  // Back to previous value
+        this.setValueCallback = function (gameObject, value) {
+            inputText.setText('').setText(gameObject.getFotmatText(value));
+
+            slider.setValue(value, gameObject.minValue, gameObject.maxValue);
         }
 
-        var text = (this.textFormatCallback) ? this.textFormatCallback(value) : value;
-        this.childrenMap.inputText.setText('').setText(text);
+        this.setupCallback = function(gameObject, config) {
+            gameObject.setInputTextReadOnly(!!config.inputTextReadOnly);
 
-        this.childrenMap.slider.setValue(value, this.minValue, this.maxValue);
-        super.value = value;  // Fire 'valuechange' event
+            gameObject.setRange(config.min, config.max, config.step);
+        }
     }
 
     setRange(min, max, step) {

diff --git a/templates/ui/tweaker/gameobjects/inputfield/TextAreaInput.js b/templates/ui/tweaker/gameobjects/inputfield/TextAreaInput.js
@@ -33,23 +33,14 @@ class TextAreaInput extends InputFiledBase {
         inputText.on('close', function () {
             this.setValue(inputText.value);
         }, this);
-    }
-
-    get value() {
-        return this._value;
-    }
-
-    set value(value) {
-        if (this._value === value) {
-            return;
-        }
-        if (!this.validate(value)) {
-            value = this._value;  // Back to previous value
+
+        this.setValueCallback = function (gameObject, value) {
+            inputText.setText(gameObject.getFotmatText(value));
         }
 
-        var text = (this.textFormatCallback) ? this.textFormatCallback(value) : value;
-        this.childrenMap.inputText.setText(text);
-        super.value = value;  // Fire 'valuechange' event
+        this.setupCallback = function(gameObject, config) {
+            gameObject.setInputTextReadOnly(!!config.inputTextReadOnly);
+        }
     }
 
     setInputTextReadOnly(enable) {

diff --git a/templates/ui/tweaker/gameobjects/inputfield/TextInput.js b/templates/ui/tweaker/gameobjects/inputfield/TextInput.js
@@ -23,23 +23,15 @@ class TextInput extends InputFiledBase {
         inputText.on('close', function () {
             this.setValue(inputText.value);
         }, this);
-    }
-
-    get value() {
-        return this._value;
-    }
 
-    set value(value) {
-        if (this._value === value) {
-            return;
+        this.setValueCallback = function (gameObject, value) {
+            inputText.setText(gameObject.getFotmatText(value));
         }
-        if (!this.validate(value)) {
-            value = this._value;  // Back to previous value
+
+        this.setupCallback = function (gameObject, config) {
+            gameObject.setInputTextReadOnly(!!config.inputTextReadOnly);
         }
 
-        var text = (this.textFormatCallback) ? this.textFormatCallback(value) : value;
-        this.childrenMap.inputText.setText(text);
-        super.value = value;  // Fire 'valuechange' event
     }
 
     setInputTextReadOnly(enable) {

diff --git a/templates/ui/tweaker/gameobjects/inputfield/ToggleSwitchInput.js b/templates/ui/tweaker/gameobjects/inputfield/ToggleSwitchInput.js
@@ -34,22 +34,10 @@ class ToggleSwitchInput extends InputFiledBase {
         toggleSwitch.on('valuechange', function (value) {
             this.setValue(value);
         }, this);
-    }
-
-    get value() {
-        return this._value;
-    }
 
-    set value(value) {
-        if (this._value === value) {
-            return;
+        this.setValueCallback = function (gameObject, value) {
+            toggleSwitch.setValue(value);
         }
-        if (!this.validate(value)) {
-            value = this._value;  // Back to previous value
-        }
-
-        this.childrenMap.toggleSwitch.setValue(value);
-        super.value = value;  // Fire 'valuechange' event
     }
 }