CJKmkp/community
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update MW_ShapeDrawing.cs

Browse Source
This commit is contained in:
CJK_mkp
2025-10-31 12:18:45 +08:00
committed by GitHub
parent f34bac49e4
commit 2f6f719843
1 changed files with 27 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs
+26 -32
View File
@@ -189,11 +189,8 @@ namespace Ink_Canvas
EnterShapeDrawingMode(1); EnterShapeDrawingMode(1);
lastMouseDownSender = null; lastMouseDownSender = null;
// 先保存长按状态，避免被CancelSingleFingerDragMode重置
bool wasLongPressed = isLongPressSelected; bool wasLongPressed = isLongPressSelected;
CancelSingleFingerDragMode();
if (wasLongPressed) if (wasLongPressed)
{ {
if (ToggleSwitchDrawShapeBorderAutoHide.IsOn) CollapseBorderDrawShape(); if (ToggleSwitchDrawShapeBorderAutoHide.IsOn) CollapseBorderDrawShape();
@@ -211,11 +208,8 @@ namespace Ink_Canvas
EnterShapeDrawingMode(8); EnterShapeDrawingMode(8);
lastMouseDownSender = null; lastMouseDownSender = null;
// 先保存长按状态，避免被CancelSingleFingerDragMode重置
bool wasLongPressed = isLongPressSelected; bool wasLongPressed = isLongPressSelected;
CancelSingleFingerDragMode();
if (wasLongPressed) if (wasLongPressed)
{ {
if (ToggleSwitchDrawShapeBorderAutoHide.IsOn) CollapseBorderDrawShape(); if (ToggleSwitchDrawShapeBorderAutoHide.IsOn) CollapseBorderDrawShape();
@@ -233,10 +227,10 @@ namespace Ink_Canvas
EnterShapeDrawingMode(18); EnterShapeDrawingMode(18);
lastMouseDownSender = null; lastMouseDownSender = null;
// 先保存长按状态，避免被CancelSingleFingerDragMode重置
bool wasLongPressed = isLongPressSelected; bool wasLongPressed = isLongPressSelected;
CancelSingleFingerDragMode();
if (wasLongPressed) if (wasLongPressed)
{ {
@@ -255,10 +249,10 @@ namespace Ink_Canvas
EnterShapeDrawingMode(2); EnterShapeDrawingMode(2);
lastMouseDownSender = null; lastMouseDownSender = null;
// 先保存长按状态，避免被CancelSingleFingerDragMode重置
bool wasLongPressed = isLongPressSelected; bool wasLongPressed = isLongPressSelected;
CancelSingleFingerDragMode();
if (wasLongPressed) if (wasLongPressed)
{ {
@@ -277,10 +271,10 @@ namespace Ink_Canvas
EnterShapeDrawingMode(15); EnterShapeDrawingMode(15);
lastMouseDownSender = null; lastMouseDownSender = null;
// 先保存长按状态，避免被CancelSingleFingerDragMode重置
bool wasLongPressed = isLongPressSelected; bool wasLongPressed = isLongPressSelected;
CancelSingleFingerDragMode();
if (wasLongPressed) if (wasLongPressed)
{ {
@@ -297,7 +291,7 @@ namespace Ink_Canvas
{ {
await CheckIsDrawingShapesInMultiTouchMode(); await CheckIsDrawingShapesInMultiTouchMode();
EnterShapeDrawingMode(11); EnterShapeDrawingMode(11);
CancelSingleFingerDragMode();
lastMouseDownSender = null; lastMouseDownSender = null;
DrawShapePromptToPen(); DrawShapePromptToPen();
} }
@@ -306,7 +300,7 @@ namespace Ink_Canvas
{ {
await CheckIsDrawingShapesInMultiTouchMode(); await CheckIsDrawingShapesInMultiTouchMode();
EnterShapeDrawingMode(12); EnterShapeDrawingMode(12);
CancelSingleFingerDragMode();
lastMouseDownSender = null; lastMouseDownSender = null;
DrawShapePromptToPen(); DrawShapePromptToPen();
} }
@@ -315,7 +309,7 @@ namespace Ink_Canvas
{ {
await CheckIsDrawingShapesInMultiTouchMode(); await CheckIsDrawingShapesInMultiTouchMode();
EnterShapeDrawingMode(13); EnterShapeDrawingMode(13);
CancelSingleFingerDragMode();
lastMouseDownSender = null; lastMouseDownSender = null;
DrawShapePromptToPen(); DrawShapePromptToPen();
} }
@@ -324,7 +318,7 @@ namespace Ink_Canvas
{ {
await CheckIsDrawingShapesInMultiTouchMode(); await CheckIsDrawingShapesInMultiTouchMode();
EnterShapeDrawingMode(14); EnterShapeDrawingMode(14);
CancelSingleFingerDragMode();
lastMouseDownSender = null; lastMouseDownSender = null;
DrawShapePromptToPen(); DrawShapePromptToPen();
} }
@@ -333,7 +327,7 @@ namespace Ink_Canvas
{ {
await CheckIsDrawingShapesInMultiTouchMode(); await CheckIsDrawingShapesInMultiTouchMode();
EnterShapeDrawingMode(17); EnterShapeDrawingMode(17);
CancelSingleFingerDragMode();
lastMouseDownSender = null; lastMouseDownSender = null;
DrawShapePromptToPen(); DrawShapePromptToPen();
} }
@@ -342,7 +336,7 @@ namespace Ink_Canvas
{ {
await CheckIsDrawingShapesInMultiTouchMode(); await CheckIsDrawingShapesInMultiTouchMode();
EnterShapeDrawingMode(3); EnterShapeDrawingMode(3);
CancelSingleFingerDragMode();
isLongPressSelected = false; isLongPressSelected = false;
lastMouseDownSender = null; lastMouseDownSender = null;
DrawShapePromptToPen(); DrawShapePromptToPen();
@@ -352,7 +346,7 @@ namespace Ink_Canvas
{ {
await CheckIsDrawingShapesInMultiTouchMode(); await CheckIsDrawingShapesInMultiTouchMode();
EnterShapeDrawingMode(19); EnterShapeDrawingMode(19);
CancelSingleFingerDragMode();
lastMouseDownSender = null; lastMouseDownSender = null;
DrawShapePromptToPen(); DrawShapePromptToPen();
} }
@@ -361,7 +355,7 @@ namespace Ink_Canvas
{ {
await CheckIsDrawingShapesInMultiTouchMode(); await CheckIsDrawingShapesInMultiTouchMode();
EnterShapeDrawingMode(4); EnterShapeDrawingMode(4);
CancelSingleFingerDragMode();
lastMouseDownSender = null; lastMouseDownSender = null;
DrawShapePromptToPen(); DrawShapePromptToPen();
} }
@@ -370,7 +364,7 @@ namespace Ink_Canvas
{ {
await CheckIsDrawingShapesInMultiTouchMode(); await CheckIsDrawingShapesInMultiTouchMode();
EnterShapeDrawingMode(5); EnterShapeDrawingMode(5);
CancelSingleFingerDragMode();
lastMouseDownSender = null; lastMouseDownSender = null;
DrawShapePromptToPen(); DrawShapePromptToPen();
} }
@@ -379,7 +373,7 @@ namespace Ink_Canvas
{ {
await CheckIsDrawingShapesInMultiTouchMode(); await CheckIsDrawingShapesInMultiTouchMode();
EnterShapeDrawingMode(16); EnterShapeDrawingMode(16);
CancelSingleFingerDragMode();
lastMouseDownSender = null; lastMouseDownSender = null;
DrawShapePromptToPen(); DrawShapePromptToPen();
} }
@@ -388,7 +382,7 @@ namespace Ink_Canvas
{ {
await CheckIsDrawingShapesInMultiTouchMode(); await CheckIsDrawingShapesInMultiTouchMode();
EnterShapeDrawingMode(23); EnterShapeDrawingMode(23);
CancelSingleFingerDragMode();
lastMouseDownSender = null; lastMouseDownSender = null;
DrawShapePromptToPen(); DrawShapePromptToPen();
} }
@@ -397,7 +391,7 @@ namespace Ink_Canvas
{ {
await CheckIsDrawingShapesInMultiTouchMode(); await CheckIsDrawingShapesInMultiTouchMode();
EnterShapeDrawingMode(10); EnterShapeDrawingMode(10);
CancelSingleFingerDragMode();
lastMouseDownSender = null; lastMouseDownSender = null;
DrawShapePromptToPen(); DrawShapePromptToPen();
} }
@@ -407,7 +401,7 @@ namespace Ink_Canvas
await CheckIsDrawingShapesInMultiTouchMode(); await CheckIsDrawingShapesInMultiTouchMode();
EnterShapeDrawingMode(24); EnterShapeDrawingMode(24);
drawMultiStepShapeCurrentStep = 0; drawMultiStepShapeCurrentStep = 0;
CancelSingleFingerDragMode();
lastMouseDownSender = null; lastMouseDownSender = null;
DrawShapePromptToPen(); DrawShapePromptToPen();
} }
@@ -417,7 +411,7 @@ namespace Ink_Canvas
await CheckIsDrawingShapesInMultiTouchMode(); await CheckIsDrawingShapesInMultiTouchMode();
EnterShapeDrawingMode(25); EnterShapeDrawingMode(25);
drawMultiStepShapeCurrentStep = 0; drawMultiStepShapeCurrentStep = 0;
CancelSingleFingerDragMode();
lastMouseDownSender = null; lastMouseDownSender = null;
DrawShapePromptToPen(); DrawShapePromptToPen();
} }
@@ -426,7 +420,7 @@ namespace Ink_Canvas
{ {
await CheckIsDrawingShapesInMultiTouchMode(); await CheckIsDrawingShapesInMultiTouchMode();
EnterShapeDrawingMode(20); EnterShapeDrawingMode(20);
CancelSingleFingerDragMode();
lastMouseDownSender = null; lastMouseDownSender = null;
DrawShapePromptToPen(); DrawShapePromptToPen();
} }
@@ -435,7 +429,7 @@ namespace Ink_Canvas
{ {
await CheckIsDrawingShapesInMultiTouchMode(); await CheckIsDrawingShapesInMultiTouchMode();
EnterShapeDrawingMode(22); EnterShapeDrawingMode(22);
CancelSingleFingerDragMode();
lastMouseDownSender = null; lastMouseDownSender = null;
DrawShapePromptToPen(); DrawShapePromptToPen();
} }
@@ -444,7 +438,7 @@ namespace Ink_Canvas
{ {
await CheckIsDrawingShapesInMultiTouchMode(); await CheckIsDrawingShapesInMultiTouchMode();
EnterShapeDrawingMode(21); EnterShapeDrawingMode(21);
CancelSingleFingerDragMode();
lastMouseDownSender = null; lastMouseDownSender = null;
DrawShapePromptToPen(); DrawShapePromptToPen();
} }
@@ -453,7 +447,7 @@ namespace Ink_Canvas
{ {
await CheckIsDrawingShapesInMultiTouchMode(); await CheckIsDrawingShapesInMultiTouchMode();
EnterShapeDrawingMode(6); EnterShapeDrawingMode(6);
CancelSingleFingerDragMode();
lastMouseDownSender = null; lastMouseDownSender = null;
DrawShapePromptToPen(); DrawShapePromptToPen();
} }
@@ -462,7 +456,7 @@ namespace Ink_Canvas
{ {
await CheckIsDrawingShapesInMultiTouchMode(); await CheckIsDrawingShapesInMultiTouchMode();
EnterShapeDrawingMode(7); EnterShapeDrawingMode(7);
CancelSingleFingerDragMode();
lastMouseDownSender = null; lastMouseDownSender = null;
DrawShapePromptToPen(); DrawShapePromptToPen();
} }
@@ -474,7 +468,7 @@ namespace Ink_Canvas
isFirstTouchCuboid = true; isFirstTouchCuboid = true;
CuboidFrontRectIniP = new Point(); CuboidFrontRectIniP = new Point();
CuboidFrontRectEndP = new Point(); CuboidFrontRectEndP = new Point();
CancelSingleFingerDragMode();
lastMouseDownSender = null; lastMouseDownSender = null;
DrawShapePromptToPen(); DrawShapePromptToPen();
} }