v6.18.11 ChickenPaint Beのレイヤーパレットに、グループ結合アイコンを追加。

satopian · Jan 14, 2024 · 2c809db · 2c809db
1 parent dadffef
commit 2c809db
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 21 deletions.
diff --git a/potiboard5/chickenpaint/css/chickenpaint.css b/potiboard5/chickenpaint/css/chickenpaint.css
diff --git a/potiboard5/chickenpaint/js/chickenpaint.js b/potiboard5/chickenpaint/js/chickenpaint.js
@@ -22959,10 +22959,6 @@ function CPLayersPalette(controller) {
         title: "Merge down",
         icon: createFontAwesomeIcon("fa-arrow-down"),
         action: "CPLayerMergeDown"
-      }, {
-        title: "Add group",
-        icon: createFontAwesomeIcon("fa-folder"),
-        action: "CPAddGroup"
       }, {
         title: "Add layer mask",
         icon: createChickenPaintIcon("mask"),
@@ -22983,6 +22979,14 @@ function CPLayersPalette(controller) {
         icon: createFontAwesomeIcon("fa-level-down-alt fa-flip-horizontal"),
         action: "CPReleaseClippingMask",
         require: "clipping-mask"
+      }, {
+        title: "Add group",
+        icon: createFontAwesomeIcon("fa-folder"),
+        action: "CPAddGroup"
+      }, {
+        title: "Merge group",
+        icon: createFontAwesomeIcon("fa-compress-arrows-alt"),
+        action: "CPGroupMerge"
       }, {
         title: "Delete layer",
         icon: createFontAwesomeIcon("fa-trash"),

diff --git a/potiboard5/chickenpaint/js/chickenpaint.js.map b/potiboard5/chickenpaint/js/chickenpaint.js.map
diff --git a/potiboard5/chickenpaint/js/chickenpaint.min.js b/potiboard5/chickenpaint/js/chickenpaint.min.js
diff --git a/potiboard5/chickenpaint/js/chickenpaint.min.js.map b/potiboard5/chickenpaint/js/chickenpaint.min.js.map
diff --git a/potiboard5/potiboard.php b/potiboard5/potiboard.php
@@ -3,8 +3,8 @@
 
 // POTI-board EVO
 // バージョン :
-const POTI_VER = 'v6.18.10';
-const POTI_LOT = 'lot.20240113';
+const POTI_VER = 'v6.18.11';
+const POTI_LOT = 'lot.20240114';
 
 /*
   (C) 2018-2023 POTI改 POTI-board redevelopment team