Merge pull request #37 from awesome-iwb/beta

ICC CE 1.6.7 （ICC CE Beta 1.6.14）

AutomaticUpdateVersionControl.txt

@@ -1 +1 @@
-1.6.6
+1.6.7

Ink Canvas/AssemblyInfo.cs

@@ -49,5 +49,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.6.6")]
+[assembly: AssemblyVersion("1.6.7")]
-[assembly: AssemblyFileVersion("1.6.6")]
+[assembly: AssemblyFileVersion("1.6.7")]

Ink Canvas/MainWindow.xaml.cs

@@ -646,7 +646,9 @@ namespace Ink_Canvas {
         {
             // 关闭设置面板
             BorderSettings.Visibility = Visibility.Collapsed;
+            // 设置蒙版为不可点击，并清除背景
             BorderSettingsMask.IsHitTestVisible = false;
+            BorderSettingsMask.Background = null; // 确保清除蒙层背景
         }
 
         // 新增：折叠侧边栏
@@ -679,7 +681,9 @@ namespace Ink_Canvas {
         {
             // 显示设置面板
             BorderSettings.Visibility = Visibility.Visible;
+            // 设置蒙版为可点击，并添加半透明背景
             BorderSettingsMask.IsHitTestVisible = true;
+            BorderSettingsMask.Background = new SolidColorBrush(System.Windows.Media.Color.FromArgb(1, 0, 0, 0));
             
             // 获取SettingsPanelScrollViewer中的所有GroupBox
             var stackPanel = SettingsPanelScrollViewer.Content as StackPanel;

Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs

@@ -519,6 +519,8 @@ namespace Ink_Canvas {
                 // 初始化直线自动拉直相关设置
                 ToggleSwitchAutoStraightenLine.IsOn = Settings.Canvas.AutoStraightenLine;
                 AutoStraightenLineThresholdSlider.Value = Settings.Canvas.AutoStraightenLineThreshold;
+                // 直线拉直灵敏度也在这里初始化，即使它存储在InkToShape中
+                LineStraightenSensitivitySlider.Value = Settings.InkToShape.LineStraightenSensitivity;
                 
                 // 初始化直线端点吸附相关设置
                 ToggleSwitchLineEndpointSnapping.IsOn = Settings.Canvas.LineEndpointSnapping;
@@ -588,8 +590,7 @@ namespace Ink_Canvas {
 
                 ToggleCheckboxEnableInkToShapeRounded.IsChecked = Settings.InkToShape.IsInkToShapeRounded;
                 
-                // 初始化直线拉直灵敏度
+                // 直线拉直灵敏度在Canvas部分已经初始化，这里不再重复
-                LineStraightenSensitivitySlider.Value = Settings.InkToShape.LineStraightenSensitivity;
             } else {
                 Settings.InkToShape = new InkToShape();
             }

Ink Canvas/MainWindow_cs/MW_SimulatePressure&InkToShape.cs

@@ -13,7 +13,6 @@ namespace Ink_Canvas {
     public partial class MainWindow : Window {
         private StrokeCollection newStrokes = new StrokeCollection();
         private List<Circle> circles = new List<Circle>();
-        private const double SNAP_THRESHOLD = 15.0; // Distance threshold for endpoint snapping
         private const double LINE_STRAIGHTEN_THRESHOLD = 0.10; // 降低阈值，让直线检测更严格
 
         private void inkCanvas_StrokeCollected(object sender, InkCanvasStrokeCollectedEventArgs e) {
@@ -120,25 +119,34 @@ namespace Ink_Canvas {
                 
                 // Apply line straightening and endpoint snapping if ink-to-shape is enabled
                 if (Settings.InkToShape.IsInkToShapeEnabled) {
-                    // Check if this stroke could be a straight line
+                    // 检查是否启用了直线自动拉直功能
-                    if (IsPotentialStraightLine(e.Stroke)) {
+                    if (Settings.Canvas.AutoStraightenLine && IsPotentialStraightLine(e.Stroke)) {
                         // Get start and end points of the stroke
                         Point startPoint = e.Stroke.StylusPoints[0].ToPoint();
                         Point endPoint = e.Stroke.StylusPoints[e.Stroke.StylusPoints.Count - 1].ToPoint();
                         
-                        // Try to snap endpoints to existing strokes
+                        // 端点吸附和直线拉直完全分离处理
                         bool snapped = false;
-                        if (Settings.InkToShape.IsInkToShapeRectangle || Settings.InkToShape.IsInkToShapeTriangle) {
+                        
-                            Point[] snappedPoints = GetSnappedEndpoints(startPoint, endPoint);
+                        // 只有在启用端点吸附时才尝试吸附
-                            if (snappedPoints != null) {
+                        if (Settings.Canvas.LineEndpointSnapping) {
-                                startPoint = snappedPoints[0];
+                            // 只有在启用了形状识别（矩形或三角形）时才执行端点吸附
-                                endPoint = snappedPoints[1];
+                            if (Settings.InkToShape.IsInkToShapeRectangle || Settings.InkToShape.IsInkToShapeTriangle) {
-                                snapped = true;
+                                Point[] snappedPoints = GetSnappedEndpoints(startPoint, endPoint);
+                                if (snappedPoints != null) {
+                                    startPoint = snappedPoints[0];
+                                    endPoint = snappedPoints[1];
+                                    snapped = true;
+                                }
                             }
                         }
 
-                        // Create straight line stroke
+                        // 独立检查是否应该拉直线条，无论端点吸附是否启用或成功
-                        if (snapped || ShouldStraightenLine(e.Stroke)) {
+                        bool shouldStraighten = ShouldStraightenLine(e.Stroke);
+                        
+                        // 如果满足任一条件（吸附成功或应该拉直），则创建直线
+                        // 这里的条件是"或"关系，只要有一个条件满足就会创建直线
+                        if (snapped || shouldStraighten) {
                             StylusPointCollection straightLinePoints = CreateStraightLine(startPoint, endPoint);
                             Stroke straightStroke = new Stroke(straightLinePoints) {
                                 DrawingAttributes = inkCanvas.DefaultDrawingAttributes.Clone()
@@ -574,8 +582,8 @@ namespace Ink_Canvas {
             Point end = stroke.StylusPoints.Last().ToPoint();
             double lineLength = GetDistance(start, end);
             
-            // 线条必须足够长才考虑拉直，至少30像素
+            // 线条必须足够长才考虑拉直，使用设置中的阈值
-            if (lineLength < 30)
+            if (lineLength < Settings.Canvas.AutoStraightenLineThreshold)
                 return false;
                 
             // 获取用户设置的灵敏度值
@@ -620,8 +628,8 @@ namespace Ink_Canvas {
             double maxDeviation = 0;
             double lineLength = GetDistance(start, end);
             
-            // 如果线条太短，不进行拉直处理
+            // 如果线条太短，不进行拉直处理，使用设置中的阈值
-            if (lineLength < 50) {
+            if (lineLength < Settings.Canvas.AutoStraightenLineThreshold) {
                 return false;
             }
             
@@ -732,11 +740,19 @@ namespace Ink_Canvas {
         
         // New method: Attempts to snap endpoints to existing stroke endpoints
         private Point[] GetSnappedEndpoints(Point start, Point end) {
+            // 如果端点吸附功能关闭，直接返回null
+            // 这里不再返回原始点，因为调用此方法的地方会判断返回值是否为null
+            if (!Settings.Canvas.LineEndpointSnapping)
+                return null;
+                
             bool startSnapped = false;
             bool endSnapped = false;
             Point snappedStart = start;
             Point snappedEnd = end;
             
+            // 使用设置中的吸附距离阈值
+            double snapThreshold = Settings.Canvas.LineEndpointSnappingThreshold;
+            
             // Check all strokes in canvas for potential snap points
             foreach (Stroke stroke in inkCanvas.Strokes) {
                 if (stroke.StylusPoints.Count == 0) continue;
@@ -747,10 +763,10 @@ namespace Ink_Canvas {
                 
                 // Check if start point should snap to an endpoint
                 if (!startSnapped) {
-                    if (GetDistance(start, strokeStart) < SNAP_THRESHOLD) {
+                    if (GetDistance(start, strokeStart) < snapThreshold) {
                         snappedStart = strokeStart;
                         startSnapped = true;
-                    } else if (GetDistance(start, strokeEnd) < SNAP_THRESHOLD) {
+                    } else if (GetDistance(start, strokeEnd) < snapThreshold) {
                         snappedStart = strokeEnd;
                         startSnapped = true;
                     }
@@ -758,10 +774,10 @@ namespace Ink_Canvas {
                 
                 // Check if end point should snap to an endpoint
                 if (!endSnapped) {
-                    if (GetDistance(end, strokeStart) < SNAP_THRESHOLD) {
+                    if (GetDistance(end, strokeStart) < snapThreshold) {
                         snappedEnd = strokeStart;
                         endSnapped = true;
-                    } else if (GetDistance(end, strokeEnd) < SNAP_THRESHOLD) {
+                    } else if (GetDistance(end, strokeEnd) < snapThreshold) {
                         snappedEnd = strokeEnd;
                         endSnapped = true;
                     }

Ink Canvas/Properties/AssemblyInfo.cs

@@ -49,5 +49,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.6.6")]
+[assembly: AssemblyVersion("1.6.7")]
-[assembly: AssemblyFileVersion("1.6.6")]
+[assembly: AssemblyFileVersion("1.6.7")]