Merge branch 'develop'

PhaserEditor2D · Jul 2, 2023 · f0403ef · f0403ef
2 parents 15610b4 + 28556e1
commit f0403ef
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/CHANGELOG.MD b/CHANGELOG.MD
@@ -1,5 +1,9 @@
 # Change Log
 
+## v3.62.1, Jun 30, 2023
+
+* Fixes KeyCode user property editor.
+
 ## v3.62.0, Jun 29, 2023
 
 * New Event user property.

diff --git a/source/editor/plugins/phasereditor2d.ide/src/IDEPlugin.ts b/source/editor/plugins/phasereditor2d.ide/src/IDEPlugin.ts
@@ -323,7 +323,7 @@ namespace phasereditor2d.ide {
 
     /* program entry point */
 
-    export const VER = "3.62.0";
+    export const VER = "3.62.1";
 
     async function main() {
 

diff --git a/...gins/phasereditor2d.scene/src/ui/sceneobjects/object/properties/SceneGameObjectSection.ts b/...gins/phasereditor2d.scene/src/ui/sceneobjects/object/properties/SceneGameObjectSection.ts
@@ -214,7 +214,7 @@ namespace phasereditor2d.scene.ui.sceneobjects {
             const labelElement = this.createLabel(parent, prop.label, PhaserHelp(prop.tooltip));
             labelElement.style.gridColumn = "2";
 
-            const buttonElement = this.createKeyCodeField(parent, prop);
+            const buttonElement = this.createKeyCodeField(parent, prop, lockIcon);
 
             return { labelElement, buttonElement };
         }

diff --git a/.../plugins/phasereditor2d.scene/src/ui/sceneobjects/object/properties/SceneObjectSection.ts b/.../plugins/phasereditor2d.scene/src/ui/sceneobjects/object/properties/SceneObjectSection.ts
@@ -197,7 +197,7 @@ namespace phasereditor2d.scene.ui.sceneobjects {
             return colorElement;
         }
 
-        createKeyCodeField(parent: HTMLElement, property: IProperty<T>) {
+        createKeyCodeField(parent: HTMLElement, property: IProperty<T>, checkUnlock = true) {
 
             const btn = this.createButton(parent, "KeyCode", e => {
 
@@ -220,7 +220,7 @@ namespace phasereditor2d.scene.ui.sceneobjects {
                     const keys = this.getSelection();
 
                     this.getEditor().getUndoManager().add(
-                        new SimpleOperation(this.getEditor(), keys, KeyboardKeyComponent.keyCode, value));
+                        new SimpleOperation(this.getEditor(), keys, property, value));
 
                 }, false);
 
@@ -231,6 +231,8 @@ namespace phasereditor2d.scene.ui.sceneobjects {
 
                 btn.textContent = this.flatValues_StringOneOrNothing(
                     this.getSelection().map(obj => property.getValue(obj)));
+
+                btn.disabled = checkUnlock && !this.isUnlocked(property);
             });
         }