소스 검색

other cases of tool interaction

circular17 6 년 전
부모
커밋
82049ac2c3
1개의 변경된 파일5개의 추가작업 그리고 1개의 파일을 삭제
  1. 5 1
      lazpaint/image/uimageaction.pas

+ 5 - 1
lazpaint/image/uimageaction.pas

@@ -1064,7 +1064,7 @@ end;
 
 
 procedure TImageActions.RasterizeLayer;
 procedure TImageActions.RasterizeLayer;
 begin
 begin
-  if CurrentTool in[ptMoveLayer,ptRotateLayer,ptZoomLayer,ptLayerMapping] then
+  if CurrentTool in[ptMoveLayer,ptRotateLayer,ptZoomLayer,ptLayerMapping,ptDeformation] then
     ChooseTool(ptHand);
     ChooseTool(ptHand);
   ToolManager.ToolCloseDontReopen;
   ToolManager.ToolCloseDontReopen;
   Image.RasterizeLayer;
   Image.RasterizeLayer;
@@ -1088,7 +1088,11 @@ begin
   if (Image.CurrentLayerIndex <> -1) and (Image.NbLayers > 1) then
   if (Image.CurrentLayerIndex <> -1) and (Image.NbLayers > 1) then
   begin
   begin
     idx := Image.CurrentLayerIndex;
     idx := Image.CurrentLayerIndex;
+    if CurrentTool in[ptMoveLayer,ptRotateLayer,ptZoomLayer,ptLayerMapping,ptDeformation] then
+      ChooseTool(ptHand);
+    ToolManager.ToolCloseDontReopen;
     Image.RemoveLayer;
     Image.RemoveLayer;
+    ToolManager.ToolOpen;
     FInstance.ScrollLayerStackOnItem(idx);
     FInstance.ScrollLayerStackOnItem(idx);
   end;
   end;
 end;
 end;