右クリックで初期表示の色がおかしかったので修正

Author: new-sankaku

index.html

@@ -2044,7 +2044,7 @@ <h5 data-i18n="comfyUI">ComfyUI</h5>
     <script src="third/font-awesome/all.min.js"></script>
     <script src="third/localforage/localforage.min.js"></script>
 
-    <script src="js/sidebar/pen/fabric/dist/fabric-brush.min.js?v=7.2"></script>
+    <script src="js/sidebar/pen/fabric/fabric-brush.min.js?v=7.2"></script>
     <script src="js/sidebar/pen/fabric/brushes/crayon_brush.js?v=7.2"></script>
     <script src="js/sidebar/pen/fabric/brushes/ink_brush.js?v=7.2"></script>
     <script src="js/sidebar/pen/fabric/brushes/marker_brush.js?v=7.2"></script>

js/sidebar/pen/fabric/fabric-brush.min.js

@@ -105,10 +105,10 @@ function getSpeechBubbleTextFill(activeObject, type){
     }
 
     if(type == 'fill'){
-        return "rgba(255, 255, 255, 0)";
+        return "rgba(255, 255, 255, 1.0)";
     }
     if(type == 'stroke'){
-        return "rgba(0, 0, 0, 0)";
+        return "rgba(0, 0, 0, 1.0)";
     }
     if(type == 'strokeWidth'){
         return 10;

js/sidebar/speechBubble/speech-bubble-effect.js

@@ -67,10 +67,13 @@ function createObjectMenuSlider(itemValue,min,max,step,value){
   return {type: 'slider',label: itemValue,
           options: {id:itemValue,min: min,max:max,step:step,value:value}};
 }
-function createObjectMenuColor(itemValue, defaultColor) {
+function createObjectMenuColor(itemValue, defaultColor, rgba) {
   return {
     type: 'colorpicker', label: itemValue,
-    options: {id: itemValue,value: defaultColor || '#000000'}
+    options: {id: itemValue,
+              value: defaultColor || '#000000',
+              rgba:rgba
+            }
   };
 }
 
@@ -131,8 +134,10 @@ function showObjectMenu(clickType) {
   min=7, max=150, step=1, value=activeObject.fontSize, labelAndId='com-fontSize';
   let fontSize = createObjectMenuSlider(labelAndId,min,max,step,value);
 
-  let fillColor   = createObjectMenuColor("com-fill", rgbaToHex(fillTemp));
-  let strokeColor = createObjectMenuColor("com-strokeColor", rgbaToHex(strokeTemp));
+  console.log("fillTemp", fillTemp);
+  let fillColor   = createObjectMenuColor("com-fill",        rgbaToHex(fillTemp), fillTemp);
+  console.log("fillColor", fillColor);
+  let strokeColor = createObjectMenuColor("com-strokeColor", rgbaToHex(strokeTemp), strokeTemp);
 
   if (isPanel(activeObject)) {
     if (clickType !== 'left') {
@@ -213,8 +218,9 @@ function showObjectMenu(clickType) {
             <input id=   "${item.options.id}"
               name= "${item.options.id}"
               value="${item.options.value}"
-              class="jscolor-color-picker" data-initial-color="rgba(0, 0, 0, 1.0)">
+              class="jscolor-color-picker" data-initial-color="${item.options.rgba}">
           </div>`;
+          console.log("menuContent",menuContent);
         break;
       case 'button':
         menuContent += `<button id="fabricjs-${item.value}-btn">${getText(item.value)}</button>`;