improve:截图及浮动栏及代码优化

2025-08-31 09:54:13 +08:00
parent 33948c604c
commit 9bb00489fe
57 changed files with 887 additions and 413 deletions
@@ -1,8 +1,8 @@
-using Microsoft.Win32;
 using System;
 using System.IO;
 using System.Windows;
 using System.Windows.Media.Imaging;
+using Microsoft.Win32;

 namespace Ink_Canvas
 {
@@ -1,8 +1,8 @@
-using Microsoft.Win32;
 using System;
 using System.IO;
 using System.Windows;
 using System.Windows.Media.Imaging;
+using Microsoft.Win32;

 namespace Ink_Canvas
 {
@@ -1,6 +1,4 @@
-using Ink_Canvas.Helpers;
-using iNKORE.UI.WPF.Modern.Controls;
-using System;
+using System;
 using System.ComponentModel;
 using System.Media;
 using System.Timers;
@@ -9,6 +7,7 @@ using System.Windows.Forms;
 using System.Windows.Input;
 using System.Windows.Interop;
 using System.Windows.Media;
+using Ink_Canvas.Helpers;
 using Application = System.Windows.Application;
 using MouseEventArgs = System.Windows.Input.MouseEventArgs;
 using Timer = System.Timers.Timer;
@@ -92,7 +91,7 @@ namespace Ink_Canvas
        private void Grid_MouseUp(object sender, MouseButtonEventArgs e)
        {
            if (isTimerRunning) return;
-            if (ProcessBarTime.Visibility == Visibility.Visible && isTimerRunning == false)
+            if (ProcessBarTime.Visibility == Visibility.Visible && !isTimerRunning)
            {
                ProcessBarTime.Visibility = Visibility.Collapsed;
                GridAdjustHour.Visibility = Visibility.Visible;
@@ -1,7 +1,4 @@
-using Ink_Canvas.Helpers;
-using iNKORE.UI.WPF.Modern.Controls;
-using MdXaml;
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -13,6 +10,9 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Interop;
 using System.Windows.Media;
+using Ink_Canvas.Helpers;
+using iNKORE.UI.WPF.Modern.Controls;
+using MdXaml;

 namespace Ink_Canvas
 {
@@ -1,4 +1,3 @@
-using Ink_Canvas.Helpers;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -8,6 +7,8 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
+using Ink_Canvas.Helpers;
+
 // Added for OrderByDescending

 namespace Ink_Canvas
@@ -2,6 +2,7 @@ using System;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
+using System.Windows.Media;

 namespace Ink_Canvas.Windows
 {
@@ -79,20 +80,20 @@ namespace Ink_Canvas.Windows
            if (_currentKey == Key.None)
            {
                CurrentHotkeyTextBlock.Text = "未设置";
-                CurrentHotkeyTextBlock.Foreground = System.Windows.Media.Brushes.Gray;
+                CurrentHotkeyTextBlock.Foreground = Brushes.Gray;
            }
            else
            {
                var modifiersText = _currentModifiers == ModifierKeys.None ? "" : $"{_currentModifiers}+";
                CurrentHotkeyTextBlock.Text = $"{modifiersText}{_currentKey}";
-                CurrentHotkeyTextBlock.Foreground = System.Windows.Media.Brushes.Black;
+                CurrentHotkeyTextBlock.Foreground = Brushes.Black;
            }
        }

        private void StartHotkeyCapture()
        {
            BtnSetHotkey.Content = "请按键...";
-            BtnSetHotkey.Background = System.Windows.Media.Brushes.Orange;
+            BtnSetHotkey.Background = Brushes.Orange;
            
            // 设置焦点以捕获键盘事件
            Focus();
@@ -105,7 +106,7 @@ namespace Ink_Canvas.Windows
        private void StopHotkeyCapture()
        {
            BtnSetHotkey.Content = "设置";
-            BtnSetHotkey.Background = System.Windows.Media.Brushes.DodgerBlue;
+            BtnSetHotkey.Background = Brushes.DodgerBlue;
            
            // 移除键盘事件处理器
            KeyDown -= HotkeyItem_KeyDown;
@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
+using System.Reflection;
 using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Input;
 using Ink_Canvas.Helpers;

@@ -324,11 +326,11 @@ namespace Ink_Canvas.Windows
                        
                        // 立即保存到配置文件
                        _hotkeyManager.SaveHotkeysToSettings();
-                        LogHelper.WriteLogToFile($"已保存快捷键配置");
+                        LogHelper.WriteLogToFile("已保存快捷键配置");
                        
                        // 更新UI显示
                        LoadCurrentHotkeys();
-                        LogHelper.WriteLogToFile($"已更新UI显示");
+                        LogHelper.WriteLogToFile("已更新UI显示");
                        
                        LogHelper.WriteLogToFile($"快捷键 {hotkeyName} 已更新为 {modifiers}+{key} 并保存", LogHelper.LogType.Event);
                    }
@@ -403,7 +405,7 @@ namespace Ink_Canvas.Windows
            {
                // 通过反射访问主窗口的penType字段
                var penTypeField = _mainWindow.GetType().GetField("penType", 
-                    System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance);
+                    BindingFlags.NonPublic | BindingFlags.Instance);
                
                if (penTypeField != null)
                {
@@ -411,7 +413,7 @@ namespace Ink_Canvas.Windows
                    
                    // 调用CheckPenTypeUIState方法更新UI状态
                    var checkPenTypeMethod = _mainWindow.GetType().GetMethod("CheckPenTypeUIState", 
-                        System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance);
+                        BindingFlags.NonPublic | BindingFlags.Instance);
                    
                    if (checkPenTypeMethod != null)
                    {
@@ -436,7 +438,7 @@ namespace Ink_Canvas.Windows
            {
                // 通过反射访问主窗口的设置面板
                var settingsBorder = _mainWindow.GetType().GetField("BorderSettings", 
-                    System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)?.GetValue(_mainWindow) as System.Windows.Controls.Border;
+                    BindingFlags.NonPublic | BindingFlags.Instance)?.GetValue(_mainWindow) as Border;
                
                if (settingsBorder != null)
                {
@@ -445,7 +447,7 @@ namespace Ink_Canvas.Windows

                // 隐藏设置蒙版
                var settingsMask = _mainWindow.GetType().GetField("BorderSettingsMask", 
-                    System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)?.GetValue(_mainWindow) as System.Windows.Controls.Border;
+                    BindingFlags.NonPublic | BindingFlags.Instance)?.GetValue(_mainWindow) as Border;
                
                if (settingsMask != null)
                {
@@ -467,7 +469,7 @@ namespace Ink_Canvas.Windows
            {
                // 通过反射访问主窗口的设置面板
                var settingsBorder = _mainWindow.GetType().GetField("BorderSettings", 
-                    System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)?.GetValue(_mainWindow) as System.Windows.Controls.Border;
+                    BindingFlags.NonPublic | BindingFlags.Instance)?.GetValue(_mainWindow) as Border;
                
                if (settingsBorder != null)
                {
@@ -476,7 +478,7 @@ namespace Ink_Canvas.Windows

                // 显示设置蒙版
                var settingsMask = _mainWindow.GetType().GetField("BorderSettingsMask", 
-                    System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)?.GetValue(_mainWindow) as System.Windows.Controls.Border;
+                    BindingFlags.NonPublic | BindingFlags.Instance)?.GetValue(_mainWindow) as Border;
                
                if (settingsMask != null)
                {
@@ -1,7 +1,7 @@
-using Ink_Canvas.Helpers;
-using System.ComponentModel;
+using System.ComponentModel;
 using System.IO;
 using System.Windows;
+using Ink_Canvas.Helpers;

 namespace Ink_Canvas
 {
@@ -1,7 +1,6 @@
-using Ink_Canvas.Helpers;
-using iNKORE.UI.WPF.Modern.Controls;
-using System.Windows;
+using System.Windows;
 using System.Windows.Input;
+using Ink_Canvas.Helpers;

 namespace Ink_Canvas
 {
@@ -1,9 +1,3 @@
-using Ink_Canvas.Helpers;
-using Ink_Canvas.Helpers.Plugins;
-using Ink_Canvas.Helpers.Plugins.BuiltIn;
-using Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher;
-using iNKORE.UI.WPF.Modern.Controls;
-using Microsoft.Win32;
 using System;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
@@ -12,6 +6,12 @@ using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Threading;
+using Ink_Canvas.Helpers;
+using Ink_Canvas.Helpers.Plugins;
+using Ink_Canvas.Helpers.Plugins.BuiltIn;
+using Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher;
+using iNKORE.UI.WPF.Modern.Controls;
+using Microsoft.Win32;
 using MessageBox = System.Windows.MessageBox;

 namespace Ink_Canvas.Windows
@@ -1,7 +1,4 @@
-using Ink_Canvas.Helpers;
-using iNKORE.UI.WPF.Modern.Controls;
-using Microsoft.VisualBasic;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
@@ -11,6 +8,8 @@ using System.Windows;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
+using Ink_Canvas.Helpers;
+using Microsoft.VisualBasic;
 using MessageBox = iNKORE.UI.WPF.Modern.Controls.MessageBox;

 namespace Ink_Canvas
@@ -24,7 +23,7 @@ namespace Ink_Canvas
        {
            InitializeComponent();
            AnimationsHelper.ShowWithSlideFromBottomAndFade(this, 0.25);
-            BorderBtnHelp.Visibility = settings.RandSettings.DisplayRandWindowNamesInputBtn == false ? Visibility.Collapsed : Visibility.Visible;
+            BorderBtnHelp.Visibility = !settings.RandSettings.DisplayRandWindowNamesInputBtn ? Visibility.Collapsed : Visibility.Visible;
            RandMaxPeopleOneTime = settings.RandSettings.RandWindowOnceMaxStudents;
            RandDoneAutoCloseWaitTime = (int)settings.RandSettings.RandWindowOnceCloseLatency * 1000;

@@ -69,7 +68,7 @@ namespace Ink_Canvas
            isAutoClose = IsAutoClose;
            PeopleControlPane.Opacity = 0.4;
            PeopleControlPane.IsHitTestVisible = false;
-            BorderBtnHelp.Visibility = settings.RandSettings.DisplayRandWindowNamesInputBtn == false ? Visibility.Collapsed : Visibility.Visible;
+            BorderBtnHelp.Visibility = !settings.RandSettings.DisplayRandWindowNamesInputBtn ? Visibility.Collapsed : Visibility.Visible;
            RandMaxPeopleOneTime = settings.RandSettings.RandWindowOnceMaxStudents;
            RandDoneAutoCloseWaitTime = (int)settings.RandSettings.RandWindowOnceCloseLatency * 1000;

@@ -20,71 +20,157 @@
                   Fill="Black"
                   Opacity="0.3" />

+        <!-- 透明选择区域遮罩 - 使用正确的几何体操作 -->
+        <Rectangle Name="TransparentSelectionMask"
+                   Fill="Black"
+                   Opacity="0.3"
+                   Visibility="Collapsed">
+            <Rectangle.Clip>
+                <CombinedGeometry GeometryCombineMode="Exclude">
+                    <CombinedGeometry.Geometry1>
+                        <RectangleGeometry Rect="0,0,10000,10000" />
+                    </CombinedGeometry.Geometry1>
+                    <CombinedGeometry.Geometry2>
+                        <RectangleGeometry x:Name="SelectionClipGeometry" Rect="0,0,0,0" />
+                    </CombinedGeometry.Geometry2>
+                </CombinedGeometry>
+            </Rectangle.Clip>
+        </Rectangle>
+
        <!-- 选择区域容器 -->
-        <Canvas Name="SelectionCanvas">
+        <Canvas Name="SelectionCanvas" Panel.ZIndex="1000">
            <!-- 矩形选择模式 -->
            <Rectangle Name="SelectionRectangle"
-                       Stroke="Red"
-                       StrokeThickness="2"
+                       Stroke="White"
+                       StrokeThickness="1"
                       Fill="Transparent"
                       Visibility="Collapsed" />

            <!-- 任意形状选择模式 -->
            <Path Name="SelectionPath"
-                  Stroke="Red"
-                  StrokeThickness="2"
+                  Stroke="White"
+                  StrokeThickness="1"
                  Fill="Transparent"
                  Visibility="Collapsed" />

+            <!-- 控制点容器 -->
+            <Canvas Name="ControlPointsCanvas" Visibility="Collapsed" Panel.ZIndex="1002">
+                <!-- 四个角控制点 -->
+                <Ellipse Name="TopLeftControl" Width="8" Height="8" Fill="White" Stroke="White" StrokeThickness="1" Cursor="SizeNWSE" />
+                <Ellipse Name="TopRightControl" Width="8" Height="8" Fill="White" Stroke="White" StrokeThickness="1" Cursor="SizeNESW" />
+                <Ellipse Name="BottomLeftControl" Width="8" Height="8" Fill="White" Stroke="White" StrokeThickness="1" Cursor="SizeNESW" />
+                <Ellipse Name="BottomRightControl" Width="8" Height="8" Fill="White" Stroke="White" StrokeThickness="1" Cursor="SizeNWSE" />
+                
+                <!-- 四个边控制点 -->
+                <Ellipse Name="TopControl" Width="8" Height="8" Fill="White" Stroke="White" StrokeThickness="1" Cursor="SizeNS" />
+                <Ellipse Name="BottomControl" Width="8" Height="8" Fill="White" Stroke="White" StrokeThickness="1" Cursor="SizeNS" />
+                <Ellipse Name="LeftControl" Width="8" Height="8" Fill="White" Stroke="White" StrokeThickness="1" Cursor="SizeWE" />
+                <Ellipse Name="RightControl" Width="8" Height="8" Fill="White" Stroke="White" StrokeThickness="1" Cursor="SizeWE" />
+            </Canvas>
+
            <!-- 尺寸信息显示 -->
            <Border Name="SizeInfoBorder"
-                    Background="Black"
-                    Opacity="0.8"
-                    CornerRadius="3"
+                    Background="#1a1a1a"
+                    Opacity="0.9"
+                    CornerRadius="4"
                    Padding="8,4"
                    Visibility="Collapsed">
                <TextBlock Name="SizeInfoText"
                           Foreground="White"
                           FontSize="12"
+                           FontWeight="Medium"
                           Text="0 x 0" />
            </Border>
        </Canvas>

-        <!-- 模式切换按钮 -->
-        <StackPanel Orientation="Horizontal" 
-                    HorizontalAlignment="Center" 
-                    VerticalAlignment="Top" 
-                    Margin="0,100,0,0">
-            <Button Name="RectangleModeButton" 
-                    Content="矩形模式" 
-                    Margin="5,0" 
-                    Padding="10,5"
-                    Background="#2563eb"
-                    Foreground="White"
-                    BorderThickness="0"
-                    Click="RectangleModeButton_Click" />
-            <Button Name="FreehandModeButton" 
-                    Content="自由绘制" 
-                    Margin="5,0" 
-                    Padding="10,5"
-                    Background="#6b7280"
-                    Foreground="White"
-                    BorderThickness="0"
-                    Click="FreehandModeButton_Click" />
-        </StackPanel>
-
-        <!-- 提示文字 -->
-        <Border Background="Black"
-                Opacity="0.8"
-                CornerRadius="5"
-                Padding="15,8"
+        <!-- 顶部工具栏 -->
+        <Border Background="#1a1a1a" 
+                Opacity="0.95"
+                CornerRadius="8"
+                Padding="12,8"
                HorizontalAlignment="Center"
                VerticalAlignment="Top"
-                Margin="0,150,0,0">
+                Margin="0,20,0,0"
+                Panel.ZIndex="1000">
+            <StackPanel Orientation="Horizontal">
+                <!-- 模式切换按钮 -->
+                <Button Name="RectangleModeButton" 
+                        Content="矩形模式" 
+                        Margin="4,0"
+                        Padding="12,6"
+                        Background="#2563eb"
+                        Foreground="White"
+                        BorderThickness="0"
+                        FontWeight="Medium"
+                        Click="RectangleModeButton_Click" />
+                <Button Name="FreehandModeButton" 
+                        Content="自由绘制" 
+                        Margin="4,0"
+                        Padding="12,6"
+                        Background="#6b7280"
+                        Foreground="White"
+                        BorderThickness="0"
+                        FontWeight="Medium"
+                        Click="FreehandModeButton_Click" />
+                
+                <!-- 分隔线 -->
+                <Separator Style="{StaticResource {x:Static ToolBar.SeparatorStyleKey}}" 
+                          Margin="8,0" 
+                          Background="#404040" />
+                
+                <!-- 操作按钮 -->
+                <Button Name="ConfirmButton"
+                        Content="确认截图"
+                        Margin="4,0"
+                        Padding="12,6"
+                        Background="#059669"
+                        Foreground="White"
+                        BorderThickness="0"
+                        FontWeight="Medium"
+                        Click="ConfirmButton_Click" />
+                <Button Name="CancelButton"
+                        Content="取消"
+                        Margin="4,0"
+                        Padding="12,6"
+                        Background="#dc2626"
+                        Foreground="White"
+                        BorderThickness="0"
+                        FontWeight="Medium"
+                        Click="CancelButton_Click" />
+            </StackPanel>
+        </Border>
+
+        <!-- 提示文字 -->
+        <Border Background="#1a1a1a"
+                Opacity="0.9"
+                CornerRadius="6"
+                Padding="16,10"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Top"
+                Margin="0,80,0,0"
+                Panel.ZIndex="1000">
            <TextBlock Name="HintText"
                       Text="拖拽鼠标选择矩形区域，或使用自由绘制模式"
                       Foreground="White"
-                       FontSize="16" />
+                       FontSize="14"
+                       FontWeight="Medium" />
+        </Border>
+
+        <!-- 调整模式提示 -->
+        <Border Name="AdjustModeHint"
+                Background="#1a1a1a"
+                Opacity="0.9"
+                CornerRadius="6"
+                Padding="16,10"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Bottom"
+                Margin="0,0,0,20"
+                Visibility="Collapsed"
+                Panel.ZIndex="1000">
+            <TextBlock Text="拖拽控制点调整选择区域，或拖拽边框移动位置"
+                       Foreground="White"
+                       FontSize="14"
+                       FontWeight="Medium" />
        </Border>
    </Grid>
 </Window>
@@ -1,25 +1,43 @@
 using System;
 using System.Collections.Generic;
 using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Forms;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Shapes;
+using System.Windows.Threading;
 using Brushes = System.Windows.Media.Brushes;
 using Color = System.Windows.Media.Color;
 using DrawingRectangle = System.Drawing.Rectangle;
-// 为了避免命名冲突，使用别名
+using KeyEventArgs = System.Windows.Input.KeyEventArgs;
+using MouseEventArgs = System.Windows.Input.MouseEventArgs;
 using WpfCanvas = System.Windows.Controls.Canvas;

 namespace Ink_Canvas
 {
    public partial class ScreenshotSelectorWindow : Window
    {
-        private bool _isSelecting = false;
-        private bool _isFreehandMode = false;
+        private bool _isSelecting;
+        private bool _isFreehandMode;
+        private bool _isAdjusting;
+        private bool _isMoving;
        private Point _startPoint;
        private Point _currentPoint;
+        private Point _lastMousePosition;
        private List<Point> _freehandPoints;
        private Polyline _freehandPolyline;
+        private Rect _currentSelection;
+        private ControlPointType _activeControlPoint = ControlPointType.None;
+
+        // 控制点类型枚举
+        private enum ControlPointType
+        {
+            None,
+            TopLeft, TopRight, BottomLeft, BottomRight,
+            Top, Bottom, Left, Right,
+            Move
+        }

        public DrawingRectangle? SelectedArea { get; private set; }
        public List<Point> SelectedPath { get; private set; }
@@ -34,8 +52,11 @@ namespace Ink_Canvas
            // 初始化自由绘制模式
            InitializeFreehandMode();

+            // 绑定控制点事件
+            BindControlPointEvents();
+
            // 隐藏提示文字的定时器
-            var timer = new System.Windows.Threading.DispatcherTimer();
+            var timer = new DispatcherTimer();
            timer.Interval = TimeSpan.FromSeconds(5);
            timer.Tick += (s, e) =>
            {
@@ -50,17 +71,41 @@ namespace Ink_Canvas
            _freehandPoints = new List<Point>();
            _freehandPolyline = new Polyline
            {
-                Stroke = Brushes.Red,
-                StrokeThickness = 2,
+                Stroke = Brushes.White,
+                StrokeThickness = 1,
                Fill = Brushes.Transparent
            };
            SelectionCanvas.Children.Add(_freehandPolyline);
        }

+        private void BindControlPointEvents()
+        {
+            // 绑定所有控制点的鼠标事件
+            var controlPoints = new[] 
+            {
+                TopLeftControl, TopRightControl, BottomLeftControl, BottomRightControl,
+                TopControl, BottomControl, LeftControl, RightControl
+            };
+
+            foreach (var control in controlPoints)
+            {
+                control.MouseLeftButtonDown += ControlPoint_MouseLeftButtonDown;
+                control.MouseLeftButtonUp += ControlPoint_MouseLeftButtonUp;
+                control.MouseMove += ControlPoint_MouseMove;
+                
+                // 确保控制点能够接收鼠标事件
+                control.IsHitTestVisible = true;
+                control.Focusable = false;
+                
+                // 设置控制点的Z-index，确保它们在最上层
+                WpfCanvas.SetZIndex(control, 1003);
+            }
+        }
+
        private void SetupFullScreenOverlay()
        {
            // 获取所有屏幕的虚拟屏幕边界
-            var virtualScreen = System.Windows.Forms.SystemInformation.VirtualScreen;
+            var virtualScreen = SystemInformation.VirtualScreen;

            // 转换为WPF坐标系统
            var dpiScale = GetDpiScale();
@@ -85,11 +130,11 @@ namespace Ink_Canvas
        {
            if (e.Key == Key.Escape)
            {
-                // 取消截图
-                SelectedArea = null;
-                SelectedPath = null;
-                DialogResult = false;
-                Close();
+                CancelSelection();
+            }
+            else if (e.Key == Key.Enter)
+            {
+                ConfirmSelection();
            }
        }

@@ -103,8 +148,15 @@ namespace Ink_Canvas
            // 清除自由绘制的内容
            _freehandPoints.Clear();
            _freehandPolyline.Points.Clear();
+            _freehandPolyline.Visibility = Visibility.Collapsed;
            SelectionPath.Visibility = Visibility.Collapsed;
            SelectionRectangle.Visibility = Visibility.Collapsed;
+            ControlPointsCanvas.Visibility = Visibility.Collapsed;
+            SizeInfoBorder.Visibility = Visibility.Collapsed;
+            
+            // 重置遮罩
+            TransparentSelectionMask.Visibility = Visibility.Collapsed;
+            OverlayRectangle.Visibility = Visibility.Visible;
        }

        private void FreehandModeButton_Click(object sender, RoutedEventArgs e)
@@ -112,16 +164,57 @@ namespace Ink_Canvas
            _isFreehandMode = true;
            FreehandModeButton.Background = new SolidColorBrush(Color.FromRgb(37, 99, 235)); // 蓝色
            RectangleModeButton.Background = new SolidColorBrush(Color.FromRgb(107, 114, 128)); // 灰色
-            HintText.Text = "按住鼠标左键绘制任意形状，松开完成";
+            HintText.Text = "按住鼠标左键绘制任意形状，松开直接截图";

            // 清除矩形选择的内容
            SelectionRectangle.Visibility = Visibility.Collapsed;
+            ControlPointsCanvas.Visibility = Visibility.Collapsed;
+            SizeInfoBorder.Visibility = Visibility.Collapsed;
+            _freehandPolyline.Visibility = Visibility.Collapsed;
            _freehandPoints.Clear();
            _freehandPolyline.Points.Clear();
+            
+            // 重置遮罩
+            TransparentSelectionMask.Visibility = Visibility.Collapsed;
+            OverlayRectangle.Visibility = Visibility.Visible;
+        }
+
+        private void ConfirmButton_Click(object sender, RoutedEventArgs e)
+        {
+            // 在自由绘制模式下，确认按钮不执行任何操作
+            if (_isFreehandMode)
+            {
+                return;
+            }
+            
+            ConfirmSelection();
+        }
+
+        private void CancelButton_Click(object sender, RoutedEventArgs e)
+        {
+            CancelSelection();
        }

        private void Window_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
        {
+            // 检查是否点击了UI元素，如果是则不处理选择
+            var hitElement = e.Source as FrameworkElement;
+            if (hitElement != null && (
+                hitElement is Ellipse || 
+                hitElement is System.Windows.Controls.Button || 
+                hitElement is Border || 
+                hitElement is TextBlock || 
+                hitElement is StackPanel ||
+                hitElement is Separator ||
+                hitElement.Name == "SizeInfoBorder" ||
+                hitElement.Name == "HintText" ||
+                hitElement.Name == "AdjustModeHint"))
+            {
+                return;
+            }
+
+            if (_isAdjusting) return; // 如果正在调整，忽略新的选择
+
            _isSelecting = true;
            _startPoint = e.GetPosition(this);
            _currentPoint = _startPoint;
@@ -131,11 +224,14 @@ namespace Ink_Canvas

            if (_isFreehandMode)
            {
-                // 自由绘制模式
+                // 自由绘制模式：开始绘制
                _freehandPoints.Clear();
                _freehandPolyline.Points.Clear();
                _freehandPoints.Add(_startPoint);
                _freehandPolyline.Points.Add(_startPoint);
+                
+                // 确保自由绘制路径可见
+                _freehandPolyline.Visibility = Visibility.Visible;
            }
            else
            {
@@ -164,6 +260,9 @@ namespace Ink_Canvas
                    // 自由绘制模式：添加点到路径
                    _freehandPoints.Add(_currentPoint);
                    _freehandPolyline.Points.Add(_currentPoint);
+                    
+                    // 确保自由绘制路径可见
+                    _freehandPolyline.Visibility = Visibility.Visible;
                }
                else
                {
@@ -182,16 +281,16 @@ namespace Ink_Canvas

                if (_isFreehandMode)
                {
-                    // 自由绘制模式：完成路径
-                    if (_freehandPoints.Count > 3) // 至少需要3个点形成有效路径
+                    // 自由绘制模式：一笔完成，直接截图
+                    if (_freehandPoints.Count > 3) // 确保有足够的点
                    {
                        // 创建路径的副本，避免修改原始列表
                        var pathPoints = new List<Point>(_freehandPoints);
                        
                        // 确保路径闭合（如果最后一个点不是起始点，则添加起始点）
                        if (pathPoints.Count > 0 && 
-                            (Math.Abs(pathPoints[pathPoints.Count - 1].X - _startPoint.X) > 1 || 
-                             Math.Abs(pathPoints[pathPoints.Count - 1].Y - _startPoint.Y) > 1))
+                            (Math.Abs(pathPoints[pathPoints.Count - 1].X - _startPoint.X) > 15 || 
+                             Math.Abs(pathPoints[pathPoints.Count - 1].Y - _startPoint.Y) > 15))
                        {
                            pathPoints.Add(_startPoint);
                        }
@@ -204,42 +303,41 @@ namespace Ink_Canvas

                        // 计算边界矩形用于截图
                        var bounds = CalculatePathBounds(optimizedPath);
-                        var dpiScale = GetDpiScale();
-                        var virtualScreen = System.Windows.Forms.SystemInformation.VirtualScreen;
+                        
+                        // 确保边界矩形有效
+                        if (bounds.Width > 1 && bounds.Height > 1)
+                        {
+                            var dpiScale = GetDpiScale();
+                            var virtualScreen = SystemInformation.VirtualScreen;

-                        int screenX = (int)((bounds.X * dpiScale) + virtualScreen.Left);
-                        int screenY = (int)((bounds.Y * dpiScale) + virtualScreen.Top);
-                        int screenWidth = (int)(bounds.Width * dpiScale);
-                        int screenHeight = (int)(bounds.Height * dpiScale);
+                            int screenX = (int)((bounds.X * dpiScale) + virtualScreen.Left);
+                            int screenY = (int)((bounds.Y * dpiScale) + virtualScreen.Top);
+                            int screenWidth = (int)(bounds.Width * dpiScale);
+                            int screenHeight = (int)(bounds.Height * dpiScale);

-                        SelectedArea = new DrawingRectangle(screenX, screenY, screenWidth, screenHeight);
-                        DialogResult = true;
-                    }
-                    else
-                    {
-                        SelectedArea = null;
-                        SelectedPath = null;
-                        DialogResult = false;
+                            SelectedArea = new DrawingRectangle(screenX, screenY, screenWidth, screenHeight);
+                            DialogResult = true;
+                            Close();
+                            return;
+                        }
                    }
+                    
+                    // 如果自由绘制失败，清除路径并继续
+                    _freehandPoints.Clear();
+                    _freehandPolyline.Points.Clear();
+                    _freehandPolyline.Visibility = Visibility.Collapsed;
+                    return;
                }
                else
                {
-                    // 矩形模式
+                    // 矩形模式：进入调整模式
                    var rect = GetSelectionRectangle();
                    if (rect.Width > 5 && rect.Height > 5) // 最小尺寸检查
                    {
-                        // 转换为屏幕坐标，考虑DPI缩放
-                        var dpiScale = GetDpiScale();
-                        var virtualScreen = System.Windows.Forms.SystemInformation.VirtualScreen;
-
-                        // 计算实际屏幕坐标
-                        int screenX = (int)((rect.X * dpiScale) + virtualScreen.Left);
-                        int screenY = (int)((rect.Y * dpiScale) + virtualScreen.Top);
-                        int screenWidth = (int)(rect.Width * dpiScale);
-                        int screenHeight = (int)(rect.Height * dpiScale);
-
-                        SelectedArea = new DrawingRectangle(screenX, screenY, screenWidth, screenHeight);
-                        DialogResult = true;
+                        _currentSelection = rect;
+                        _isAdjusting = true;
+                        ShowControlPoints();
+                        AdjustModeHint.Visibility = Visibility.Visible;
                    }
                    else
                    {
@@ -248,10 +346,160 @@ namespace Ink_Canvas
                    }
                }

-                Close();
+                if (!_isAdjusting)
+                {
+                    Close();
+                }
            }
        }

+        private void ControlPoint_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            if (!_isAdjusting) return;
+
+            _isMoving = true;
+            _lastMousePosition = e.GetPosition(this);
+            
+            // 确定当前控制点类型
+            var ellipse = sender as Ellipse;
+            if (ellipse == TopLeftControl) _activeControlPoint = ControlPointType.TopLeft;
+            else if (ellipse == TopRightControl) _activeControlPoint = ControlPointType.TopRight;
+            else if (ellipse == BottomLeftControl) _activeControlPoint = ControlPointType.BottomLeft;
+            else if (ellipse == BottomRightControl) _activeControlPoint = ControlPointType.BottomRight;
+            else if (ellipse == TopControl) _activeControlPoint = ControlPointType.Top;
+            else if (ellipse == BottomControl) _activeControlPoint = ControlPointType.Bottom;
+            else if (ellipse == LeftControl) _activeControlPoint = ControlPointType.Left;
+            else if (ellipse == RightControl) _activeControlPoint = ControlPointType.Right;
+
+            // 捕获鼠标到控制点本身，而不是整个窗口
+            ellipse?.CaptureMouse();
+            e.Handled = true;
+        }
+
+        private void ControlPoint_MouseMove(object sender, MouseEventArgs e)
+        {
+            if (!_isAdjusting || !_isMoving || _activeControlPoint == ControlPointType.None) return;
+
+            try
+            {
+                var currentPosition = e.GetPosition(this);
+                var delta = currentPosition - _lastMousePosition;
+
+                // 根据控制点类型调整选择区域
+                AdjustSelection(delta);
+
+                _lastMousePosition = currentPosition;
+                e.Handled = true;
+            }
+            catch (Exception)
+            {
+                // 如果出现异常，停止移动
+                _isMoving = false;
+                _activeControlPoint = ControlPointType.None;
+                var ellipse = sender as Ellipse;
+                ellipse?.ReleaseMouseCapture();
+            }
+        }
+
+        private void ControlPoint_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
+        {
+            if (_isMoving)
+            {
+                _isMoving = false;
+                _activeControlPoint = ControlPointType.None;
+                var ellipse = sender as Ellipse;
+                ellipse?.ReleaseMouseCapture();
+                e.Handled = true;
+            }
+        }
+
+        private void AdjustSelection(Vector delta)
+        {
+            var newRect = _currentSelection;
+
+            switch (_activeControlPoint)
+            {
+                case ControlPointType.TopLeft:
+                    newRect.X += delta.X;
+                    newRect.Y += delta.Y;
+                    newRect.Width -= delta.X;
+                    newRect.Height -= delta.Y;
+                    break;
+                case ControlPointType.TopRight:
+                    newRect.Y += delta.Y;
+                    newRect.Width += delta.X;
+                    newRect.Height -= delta.Y;
+                    break;
+                case ControlPointType.BottomLeft:
+                    newRect.X += delta.X;
+                    newRect.Width -= delta.X;
+                    newRect.Height += delta.Y;
+                    break;
+                case ControlPointType.BottomRight:
+                    newRect.Width += delta.X;
+                    newRect.Height += delta.Y;
+                    break;
+                case ControlPointType.Top:
+                    newRect.Y += delta.Y;
+                    newRect.Height -= delta.Y;
+                    break;
+                case ControlPointType.Bottom:
+                    newRect.Height += delta.Y;
+                    break;
+                case ControlPointType.Left:
+                    newRect.X += delta.X;
+                    newRect.Width -= delta.X;
+                    break;
+                case ControlPointType.Right:
+                    newRect.Width += delta.X;
+                    break;
+            }
+
+            // 确保最小尺寸
+            if (newRect.Width >= 10 && newRect.Height >= 10)
+            {
+                _currentSelection = newRect;
+                UpdateSelectionDisplay();
+            }
+        }
+
+        private void ShowControlPoints()
+        {
+            ControlPointsCanvas.Visibility = Visibility.Visible;
+            UpdateControlPointsPosition();
+        }
+
+        private void UpdateControlPointsPosition()
+        {
+            var rect = _currentSelection;
+
+            // 更新角控制点位置
+            WpfCanvas.SetLeft(TopLeftControl, rect.Left - 4);
+            WpfCanvas.SetTop(TopLeftControl, rect.Top - 4);
+            
+            WpfCanvas.SetLeft(TopRightControl, rect.Right - 4);
+            WpfCanvas.SetTop(TopRightControl, rect.Top - 4);
+            
+            WpfCanvas.SetLeft(BottomLeftControl, rect.Left - 4);
+            WpfCanvas.SetTop(BottomLeftControl, rect.Bottom - 4);
+            
+            WpfCanvas.SetLeft(BottomRightControl, rect.Right - 4);
+            WpfCanvas.SetTop(BottomRightControl, rect.Bottom - 4);
+
+            // 更新边控制点位置
+            WpfCanvas.SetLeft(TopControl, rect.Left + rect.Width / 2 - 4);
+            WpfCanvas.SetTop(TopControl, rect.Top - 4);
+            
+            WpfCanvas.SetLeft(BottomControl, rect.Left + rect.Width / 2 - 4);
+            WpfCanvas.SetTop(BottomControl, rect.Bottom - 4);
+            
+            WpfCanvas.SetLeft(LeftControl, rect.Left - 4);
+            WpfCanvas.SetTop(LeftControl, rect.Top + rect.Height / 2 - 4);
+            
+            WpfCanvas.SetLeft(RightControl, rect.Right - 4);
+            WpfCanvas.SetTop(RightControl, rect.Top + rect.Height / 2 - 4);
+        }
+
        private void UpdateSelection()
        {
            var rect = GetSelectionRectangle();
@@ -262,6 +510,56 @@ namespace Ink_Canvas
            SelectionRectangle.Width = rect.Width;
            SelectionRectangle.Height = rect.Height;

+            // 更新透明选择区域遮罩
+            UpdateTransparentSelectionMask(rect);
+
+            // 更新尺寸信息
+            SizeInfoText.Text = $"{(int)rect.Width} x {(int)rect.Height}";
+            WpfCanvas.SetLeft(SizeInfoBorder, rect.X);
+            WpfCanvas.SetTop(SizeInfoBorder, rect.Y - 30);
+
+            // 确保尺寸信息不超出屏幕
+            if (WpfCanvas.GetTop(SizeInfoBorder) < 0)
+            {
+                WpfCanvas.SetTop(SizeInfoBorder, rect.Y + rect.Height + 5);
+            }
+        }
+
+        private void UpdateTransparentSelectionMask(Rect selectionRect)
+        {
+            try
+            {
+                // 更新选择区域的几何体
+                SelectionClipGeometry.Rect = selectionRect;
+                
+                // 显示透明遮罩，隐藏原始遮罩
+                TransparentSelectionMask.Visibility = Visibility.Visible;
+                OverlayRectangle.Visibility = Visibility.Collapsed;
+            }
+            catch (Exception ex)
+            {
+                // 如果几何体操作失败，回退到原始遮罩
+                TransparentSelectionMask.Visibility = Visibility.Collapsed;
+                OverlayRectangle.Visibility = Visibility.Visible;
+            }
+        }
+
+        private void UpdateSelectionDisplay()
+        {
+            var rect = _currentSelection;
+
+            // 更新选择矩形
+            WpfCanvas.SetLeft(SelectionRectangle, rect.X);
+            WpfCanvas.SetTop(SelectionRectangle, rect.Y);
+            SelectionRectangle.Width = rect.Width;
+            SelectionRectangle.Height = rect.Height;
+
+            // 更新透明选择区域遮罩
+            UpdateTransparentSelectionMask(rect);
+
+            // 更新控制点位置
+            UpdateControlPointsPosition();
+
            // 更新尺寸信息
            SizeInfoText.Text = $"{(int)rect.Width} x {(int)rect.Height}";
            WpfCanvas.SetLeft(SizeInfoBorder, rect.X);
@@ -284,6 +582,40 @@ namespace Ink_Canvas
            return new Rect(x, y, width, height);
        }

+        private void ConfirmSelection()
+        {
+            // 在自由绘制模式下，不执行确认操作
+            if (_isFreehandMode)
+            {
+                return;
+            }
+            
+            if (_isAdjusting)
+            {
+                // 转换为屏幕坐标，考虑DPI缩放
+                var dpiScale = GetDpiScale();
+                var virtualScreen = SystemInformation.VirtualScreen;
+
+                // 计算实际屏幕坐标
+                int screenX = (int)((_currentSelection.X * dpiScale) + virtualScreen.Left);
+                int screenY = (int)((_currentSelection.Y * dpiScale) + virtualScreen.Top);
+                int screenWidth = (int)(_currentSelection.Width * dpiScale);
+                int screenHeight = (int)(_currentSelection.Height * dpiScale);
+
+                SelectedArea = new DrawingRectangle(screenX, screenY, screenWidth, screenHeight);
+                DialogResult = true;
+            }
+            Close();
+        }
+
+        private void CancelSelection()
+        {
+            SelectedArea = null;
+            SelectedPath = null;
+            DialogResult = false;
+            Close();
+        }
+
        private Rect CalculatePathBounds(List<Point> points)
        {
            if (points == null || points.Count == 0)
@@ -305,54 +637,70 @@ namespace Ink_Canvas
            return new Rect(minX, minY, maxX - minX, maxY - minY);
        }

-        // 优化路径：移除重复点和过于接近的点，提高路径质量
-        private List<Point> OptimizePath(List<Point> originalPath)
+        private List<Point> OptimizePath(List<Point> points)
        {
-            if (originalPath == null || originalPath.Count < 3)
-                return originalPath;
+            if (points == null || points.Count < 3)
+                return points;

-            var optimizedPath = new List<Point>();
-            const double minDistance = 2.0; // 最小距离阈值
+            var optimized = new List<Point>();
+            optimized.Add(points[0]);

-            // 添加第一个点
-            optimizedPath.Add(originalPath[0]);
-
-            for (int i = 1; i < originalPath.Count - 1; i++)
+            for (int i = 1; i < points.Count - 1; i++)
            {
-                var currentPoint = originalPath[i];
-                var optimizedPoint = optimizedPath[optimizedPath.Count - 1];
+                var prev = points[i - 1];
+                var current = points[i];
+                var next = points[i + 1];

-                // 计算与上一个优化点的距离
-                double distance = Math.Sqrt(
-                    Math.Pow(currentPoint.X - optimizedPoint.X, 2) + 
-                    Math.Pow(currentPoint.Y - optimizedPoint.Y, 2));
+                // 计算当前点到前后两点连线的距离
+                var distance = DistanceToLine(current, prev, next);

-                // 如果距离足够大，则添加这个点
-                if (distance >= minDistance)
+                // 如果距离大于阈值，保留这个点
+                if (distance > 2.0)
                {
-                    optimizedPath.Add(currentPoint);
+                    optimized.Add(current);
                }
            }

-            // 添加最后一个点（如果与上一个点距离足够）
-            var lastPoint = originalPath[originalPath.Count - 1];
-            var lastOptimizedPoint = optimizedPath[optimizedPath.Count - 1];
-            double finalDistance = Math.Sqrt(
-                Math.Pow(lastPoint.X - lastOptimizedPoint.X, 2) + 
-                Math.Pow(lastPoint.Y - lastOptimizedPoint.Y, 2));
+            optimized.Add(points[points.Count - 1]);
+            return optimized;
+        }

-            if (finalDistance >= minDistance)
+        private double DistanceToLine(Point point, Point lineStart, Point lineEnd)
+        {
+            var A = point.X - lineStart.X;
+            var B = point.Y - lineStart.Y;
+            var C = lineEnd.X - lineStart.X;
+            var D = lineEnd.Y - lineStart.Y;
+
+            var dot = A * C + B * D;
+            var lenSq = C * C + D * D;
+
+            if (lenSq == 0) return Math.Sqrt(A * A + B * B);
+
+            var param = dot / lenSq;
+
+            double xx, yy;
+
+            if (param < 0)
            {
-                optimizedPath.Add(lastPoint);
+                xx = lineStart.X;
+                yy = lineStart.Y;
+            }
+            else if (param > 1)
+            {
+                xx = lineEnd.X;
+                yy = lineEnd.Y;
+            }
+            else
+            {
+                xx = lineStart.X + param * C;
+                yy = lineStart.Y + param * D;
            }

-            // 确保路径至少有3个点
-            if (optimizedPath.Count < 3)
-            {
-                return originalPath;
-            }
+            var dx = point.X - xx;
+            var dy = point.Y - yy;

-            return optimizedPath;
+            return Math.Sqrt(dx * dx + dy * dy);
        }
    }
 }