Shiftでモード解除を追加、モード変更時の動作を安定化

Author: new-sankaku

js/fabric/fabric-management.js

@@ -36,6 +36,55 @@ selectable: false
 }
 });
 
+var shiftTempDisabledMode=null;
+var shiftTempDisabledKnife=false;
+
+document.addEventListener("keydown",function(e){
+if(e.key!=="Shift"||shiftTempDisabledMode!==null||shiftTempDisabledKnife)return;
+if(currentMode==="freehand"||currentMode==="point"){
+shiftTempDisabledMode=currentMode;
+currentMode="select";
+canvas.selection=true;
+canvas.forEachObject(function(obj){
+if(obj.excludeFromLayerPanel)return;
+obj.set({selectable:true,evented:true});
+});
+changeDefaultCursor();
+canvas.renderAll();
+}else if(isKnifeMode){
+shiftTempDisabledKnife=true;
+canvas.selection=true;
+canvas.forEachObject(function(obj){
+if(obj.excludeFromLayerPanel)return;
+obj.set({selectable:true,evented:true});
+});
+changeDefaultCursor();
+canvas.renderAll();
+}
+});
+
+document.addEventListener("keyup",function(e){
+if(e.key!=="Shift")return;
+if(shiftTempDisabledMode!==null){
+currentMode=shiftTempDisabledMode;
+shiftTempDisabledMode=null;
+canvas.selection=false;
+canvas.forEachObject(function(obj){
+obj.set({selectable:false,evented:false});
+});
+changeCursor(currentMode);
+canvas.renderAll();
+}else if(shiftTempDisabledKnife){
+shiftTempDisabledKnife=false;
+canvas.selection=false;
+canvas.forEachObject(function(obj){
+obj.set({selectable:false,evented:false});
+});
+changeCursor("knife");
+canvas.renderAll();
+}
+});
+
 canvas.on("object:modified",(e)=>{
 eventLogger.trace('5: object:modified');
 const obj=e.target;
@@ -250,7 +299,7 @@ highlightActiveLayerByCanvas(e.target);
 
 canvas.on("mouse:down",function (options) {
 eventLogger.trace('20: mouse:down');
-if (!isKnifeMode) return;
+if (!isKnifeMode||shiftTempDisabledKnife) return;
 
 var pointer=canvas.getPointer(options.e);
 var selectedPolygon=getPolygonAtPoint(pointer);
@@ -269,7 +318,7 @@ canvas.discardActiveObject().renderAll();
 
 canvas.on("mouse:up",function (options) {
 eventLogger.trace('21: mouse:up');
-if (!isKnifeMode||!isKnifeDrawing) return;
+if (!isKnifeMode||!isKnifeDrawing||shiftTempDisabledKnife) return;
 
 isKnifeDrawing=false;
 
@@ -282,7 +331,7 @@ currentKnifeLine=null;
 });
 
 canvas.on("mouse:move",function (options) {
-if (!isKnifeMode||!isKnifeDrawing) return;
+if (!isKnifeMode||!isKnifeDrawing||shiftTempDisabledKnife) return;
 eventLogger.trace('22: mouse:move');
 
 var pointer=canvas.getPointer(options.e);

js/sidebar/panel/knife/knife-mode.js

@@ -30,6 +30,12 @@ knifeModeButton.textContent=isKnifeMode
 : getText("knifeOn");
 
 if (isKnifeMode) {
+if(currentMode==="freehand"||currentMode==="point"){
+sbClear();
+sbClearControlePoints();
+points=[];
+}
+currentMode="select";
 activeClearButton();
 knifeModeButton.classList.add("selected");
 changeCursor("knife");

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

@@ -460,6 +460,10 @@ requestAnimationFrame(()=>canvas.renderAll());
 
 function setDrawingMode(button) {
 freehandBubbleLogger.debug("setDrawingMode called, currentMode="+currentMode);
+if(isKnifeMode){
+isKnifeMode=false;
+updateKnifeMode();
+}
 canvas.selection=false;
 setSBActiveButton(button);
 sbClear();
@@ -481,6 +485,10 @@ freehandBubbleLogger.debug("setDrawingMode completed");
 }
 
 function setSelectionMode(button) {
+if(isKnifeMode){
+isKnifeMode=false;
+updateKnifeMode();
+}
 setSBActiveButton(button);
 canvas.selection=currentMode==="select";
 if (editingGroup) canvas.remove(editingGroup);