重なり順のUI変更。

NanasuNANA · Dec 23, 2023 · ac50189 · ac50189
1 parent 1c2a0c3
commit ac50189
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 32 deletions.
diff --git a/src/app/component/game-table-mask/game-table-mask.component.ts b/src/app/component/game-table-mask/game-table-mask.component.ts
@@ -532,22 +532,25 @@ export class GameTableMaskComponent implements OnChanges, OnDestroy, AfterViewIn
           checkBox: 'check'
         }
       ),
-      {
-        name: '重なり順を一番上に', action: () => {
-          if (!this.isLock) {
-            const parent = this.gameTableMask.parent;
-            if (parent) parent.appendChild(this.gameTableMask);
-          }
-        },
-        disabled: this.isLock
-      },
-      {
-        name: '重なり順を一番下に', action: () => {
-          if (!this.isLock) {
-            const parent = this.gameTableMask.parent;
-            if (parent) parent.prependChild(this.gameTableMask);
-          }
+      { name: '重なり順', action: null, subActions: [
+        {
+          name: 'マップマスクの一番上に', action: () => {
+            if (!this.isLock) {
+              const parent = this.gameTableMask.parent;
+              if (parent) parent.appendChild(this.gameTableMask);
+            }
+          },
+          disabled: this.isLock
         },
+        {
+          name: 'マップマスクの一番下に', action: () => {
+            if (!this.isLock) {
+              const parent = this.gameTableMask.parent;
+              if (parent) parent.prependChild(this.gameTableMask);
+            }
+          },
+          disabled: this.isLock
+        }],
         disabled: this.isLock
       },
       ContextMenuSeparator,

diff --git a/src/app/component/terrain/terrain.component.ts b/src/app/component/terrain/terrain.component.ts
@@ -313,24 +313,28 @@ export class TerrainComponent implements OnChanges, OnDestroy, AfterViewInit {
             SoundEffect.play(PresetSound.lock);
           },
           checkBox: 'check'
-        }),
-      {
-        name: '重なり順を一番上に', action: () => {
-          if (!this.isLocked) {
-            const parent = this.terrain.parent;
-            if (parent) parent.appendChild(this.terrain);
-          }
-        },
-        disabled: this.isLocked
-      },
-      {
-        name: '重なり順を一番下に', action: () => {
-          if (!this.isLocked) {
-            const parent = this.terrain.parent;
-            if (parent) parent.prependChild(this.terrain);
-          }
+        }
+      ),
+      { name: `重なり順 ${this.height === 0 ? '' : ' (平面地形のみ)' }`, action: null, subActions: [
+        {
+          name: '平面地形の一番上に', action: () => {
+            if (!this.isLocked) {
+              const parent = this.terrain.parent;
+              if (parent) parent.appendChild(this.terrain);
+            }
+          },
+          disabled: this.isLocked
         },
-        disabled: this.isLocked
+        {
+          name: '平面地形の一番下に', action: () => {
+            if (!this.isLocked) {
+              const parent = this.terrain.parent;
+              if (parent) parent.prependChild(this.terrain);
+            }
+          },
+          disabled: this.isLocked
+        }],
+        disabled: this.isLocked || this.height != 0
       },
       ContextMenuSeparator,
       { name: '傾斜', action: null, subActions: [