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 14:44:59 +08:00
committed by GitHub
parent 6e0aad853c
commit 7112d58e7c
1 changed files with 33 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs
+33 -27
View File
@@ -1,4 +1,4 @@
using Ink_Canvas.Helpers; using Ink_Canvas.Helpers;
using iNKORE.UI.WPF.Modern.Controls; using iNKORE.UI.WPF.Modern.Controls;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@@ -189,8 +189,11 @@ 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();
@@ -208,8 +211,11 @@ 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();
@@ -227,10 +233,10 @@ namespace Ink_Canvas
EnterShapeDrawingMode(18); EnterShapeDrawingMode(18);
lastMouseDownSender = null; lastMouseDownSender = null;
// 先保存长按状态，避免被CancelSingleFingerDragMode重置
bool wasLongPressed = isLongPressSelected; bool wasLongPressed = isLongPressSelected;
CancelSingleFingerDragMode();
if (wasLongPressed) if (wasLongPressed)
{ {
@@ -249,10 +255,10 @@ namespace Ink_Canvas
EnterShapeDrawingMode(2); EnterShapeDrawingMode(2);
lastMouseDownSender = null; lastMouseDownSender = null;
// 先保存长按状态，避免被CancelSingleFingerDragMode重置
bool wasLongPressed = isLongPressSelected; bool wasLongPressed = isLongPressSelected;
CancelSingleFingerDragMode();
if (wasLongPressed) if (wasLongPressed)
{ {
@@ -271,10 +277,10 @@ namespace Ink_Canvas
EnterShapeDrawingMode(15); EnterShapeDrawingMode(15);
lastMouseDownSender = null; lastMouseDownSender = null;
// 先保存长按状态，避免被CancelSingleFingerDragMode重置
bool wasLongPressed = isLongPressSelected; bool wasLongPressed = isLongPressSelected;
CancelSingleFingerDragMode();
if (wasLongPressed) if (wasLongPressed)
{ {
@@ -291,7 +297,7 @@ namespace Ink_Canvas
{ {
await CheckIsDrawingShapesInMultiTouchMode(); await CheckIsDrawingShapesInMultiTouchMode();
EnterShapeDrawingMode(11); EnterShapeDrawingMode(11);
CancelSingleFingerDragMode();
lastMouseDownSender = null; lastMouseDownSender = null;
DrawShapePromptToPen(); DrawShapePromptToPen();
} }
@@ -300,7 +306,7 @@ namespace Ink_Canvas
{ {
await CheckIsDrawingShapesInMultiTouchMode(); await CheckIsDrawingShapesInMultiTouchMode();
EnterShapeDrawingMode(12); EnterShapeDrawingMode(12);
CancelSingleFingerDragMode();
lastMouseDownSender = null; lastMouseDownSender = null;
DrawShapePromptToPen(); DrawShapePromptToPen();
} }
@@ -309,7 +315,7 @@ namespace Ink_Canvas
{ {
await CheckIsDrawingShapesInMultiTouchMode(); await CheckIsDrawingShapesInMultiTouchMode();
EnterShapeDrawingMode(13); EnterShapeDrawingMode(13);
CancelSingleFingerDragMode();
lastMouseDownSender = null; lastMouseDownSender = null;
DrawShapePromptToPen(); DrawShapePromptToPen();
} }
@@ -318,7 +324,7 @@ namespace Ink_Canvas
{ {
await CheckIsDrawingShapesInMultiTouchMode(); await CheckIsDrawingShapesInMultiTouchMode();
EnterShapeDrawingMode(14); EnterShapeDrawingMode(14);
CancelSingleFingerDragMode();
lastMouseDownSender = null; lastMouseDownSender = null;
DrawShapePromptToPen(); DrawShapePromptToPen();
} }
@@ -327,7 +333,7 @@ namespace Ink_Canvas
{ {
await CheckIsDrawingShapesInMultiTouchMode(); await CheckIsDrawingShapesInMultiTouchMode();
EnterShapeDrawingMode(17); EnterShapeDrawingMode(17);
CancelSingleFingerDragMode();
lastMouseDownSender = null; lastMouseDownSender = null;
DrawShapePromptToPen(); DrawShapePromptToPen();
} }
@@ -336,7 +342,7 @@ namespace Ink_Canvas
{ {
await CheckIsDrawingShapesInMultiTouchMode(); await CheckIsDrawingShapesInMultiTouchMode();
EnterShapeDrawingMode(3); EnterShapeDrawingMode(3);
CancelSingleFingerDragMode();
isLongPressSelected = false; isLongPressSelected = false;
lastMouseDownSender = null; lastMouseDownSender = null;
DrawShapePromptToPen(); DrawShapePromptToPen();
@@ -346,7 +352,7 @@ namespace Ink_Canvas
{ {
await CheckIsDrawingShapesInMultiTouchMode(); await CheckIsDrawingShapesInMultiTouchMode();
EnterShapeDrawingMode(19); EnterShapeDrawingMode(19);
CancelSingleFingerDragMode();
lastMouseDownSender = null; lastMouseDownSender = null;
DrawShapePromptToPen(); DrawShapePromptToPen();
} }
@@ -355,7 +361,7 @@ namespace Ink_Canvas
{ {
await CheckIsDrawingShapesInMultiTouchMode(); await CheckIsDrawingShapesInMultiTouchMode();
EnterShapeDrawingMode(4); EnterShapeDrawingMode(4);
CancelSingleFingerDragMode();
lastMouseDownSender = null; lastMouseDownSender = null;
DrawShapePromptToPen(); DrawShapePromptToPen();
} }
@@ -364,7 +370,7 @@ namespace Ink_Canvas
{ {
await CheckIsDrawingShapesInMultiTouchMode(); await CheckIsDrawingShapesInMultiTouchMode();
EnterShapeDrawingMode(5); EnterShapeDrawingMode(5);
CancelSingleFingerDragMode();
lastMouseDownSender = null; lastMouseDownSender = null;
DrawShapePromptToPen(); DrawShapePromptToPen();
} }
@@ -373,7 +379,7 @@ namespace Ink_Canvas
{ {
await CheckIsDrawingShapesInMultiTouchMode(); await CheckIsDrawingShapesInMultiTouchMode();
EnterShapeDrawingMode(16); EnterShapeDrawingMode(16);
CancelSingleFingerDragMode();
lastMouseDownSender = null; lastMouseDownSender = null;
DrawShapePromptToPen(); DrawShapePromptToPen();
} }
@@ -382,7 +388,7 @@ namespace Ink_Canvas
{ {
await CheckIsDrawingShapesInMultiTouchMode(); await CheckIsDrawingShapesInMultiTouchMode();
EnterShapeDrawingMode(23); EnterShapeDrawingMode(23);
CancelSingleFingerDragMode();
lastMouseDownSender = null; lastMouseDownSender = null;
DrawShapePromptToPen(); DrawShapePromptToPen();
} }
@@ -391,7 +397,7 @@ namespace Ink_Canvas
{ {
await CheckIsDrawingShapesInMultiTouchMode(); await CheckIsDrawingShapesInMultiTouchMode();
EnterShapeDrawingMode(10); EnterShapeDrawingMode(10);
CancelSingleFingerDragMode();
lastMouseDownSender = null; lastMouseDownSender = null;
DrawShapePromptToPen(); DrawShapePromptToPen();
} }
@@ -401,7 +407,7 @@ namespace Ink_Canvas
await CheckIsDrawingShapesInMultiTouchMode(); await CheckIsDrawingShapesInMultiTouchMode();
EnterShapeDrawingMode(24); EnterShapeDrawingMode(24);
drawMultiStepShapeCurrentStep = 0; drawMultiStepShapeCurrentStep = 0;
CancelSingleFingerDragMode();
lastMouseDownSender = null; lastMouseDownSender = null;
DrawShapePromptToPen(); DrawShapePromptToPen();
} }
@@ -411,7 +417,7 @@ namespace Ink_Canvas
await CheckIsDrawingShapesInMultiTouchMode(); await CheckIsDrawingShapesInMultiTouchMode();
EnterShapeDrawingMode(25); EnterShapeDrawingMode(25);
drawMultiStepShapeCurrentStep = 0; drawMultiStepShapeCurrentStep = 0;
CancelSingleFingerDragMode();
lastMouseDownSender = null; lastMouseDownSender = null;
DrawShapePromptToPen(); DrawShapePromptToPen();
} }
@@ -420,7 +426,7 @@ namespace Ink_Canvas
{ {
await CheckIsDrawingShapesInMultiTouchMode(); await CheckIsDrawingShapesInMultiTouchMode();
EnterShapeDrawingMode(20); EnterShapeDrawingMode(20);
CancelSingleFingerDragMode();
lastMouseDownSender = null; lastMouseDownSender = null;
DrawShapePromptToPen(); DrawShapePromptToPen();
} }
@@ -429,7 +435,7 @@ namespace Ink_Canvas
{ {
await CheckIsDrawingShapesInMultiTouchMode(); await CheckIsDrawingShapesInMultiTouchMode();
EnterShapeDrawingMode(22); EnterShapeDrawingMode(22);
CancelSingleFingerDragMode();
lastMouseDownSender = null; lastMouseDownSender = null;
DrawShapePromptToPen(); DrawShapePromptToPen();
} }
@@ -438,7 +444,7 @@ namespace Ink_Canvas
{ {
await CheckIsDrawingShapesInMultiTouchMode(); await CheckIsDrawingShapesInMultiTouchMode();
EnterShapeDrawingMode(21); EnterShapeDrawingMode(21);
CancelSingleFingerDragMode();
lastMouseDownSender = null; lastMouseDownSender = null;
DrawShapePromptToPen(); DrawShapePromptToPen();
} }
@@ -447,7 +453,7 @@ namespace Ink_Canvas
{ {
await CheckIsDrawingShapesInMultiTouchMode(); await CheckIsDrawingShapesInMultiTouchMode();
EnterShapeDrawingMode(6); EnterShapeDrawingMode(6);
CancelSingleFingerDragMode();
lastMouseDownSender = null; lastMouseDownSender = null;
DrawShapePromptToPen(); DrawShapePromptToPen();
} }
@@ -456,7 +462,7 @@ namespace Ink_Canvas
{ {
await CheckIsDrawingShapesInMultiTouchMode(); await CheckIsDrawingShapesInMultiTouchMode();
EnterShapeDrawingMode(7); EnterShapeDrawingMode(7);
CancelSingleFingerDragMode();
lastMouseDownSender = null; lastMouseDownSender = null;
DrawShapePromptToPen(); DrawShapePromptToPen();
} }
@@ -468,7 +474,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();
} }