From c3fd5551d88c74b5828bbbfcac02b1924dc9b2b7 Mon Sep 17 00:00:00 2001 From: CJK_mkp <113243675+CJKmkp@users.noreply.github.com> Date: Sat, 8 Nov 2025 22:17:52 +0800 Subject: [PATCH] =?UTF-8?q?improve:=E5=BF=AB=E6=8A=BD=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../QuickDrawFloatingButtonControl.xaml} | 26 +- .../QuickDrawFloatingButtonControl.xaml.cs | 149 ++++++++ Ink Canvas/MainWindow.xaml | 74 +--- Ink Canvas/MainWindow.xaml.cs | 132 +------ Ink Canvas/Windows/QuickDrawFloatingButton.cs | 355 ------------------ 5 files changed, 165 insertions(+), 571 deletions(-) rename Ink Canvas/{Windows/QuickDrawFloatingButton.xaml => Controls/QuickDrawFloatingButtonControl.xaml} (86%) create mode 100644 Ink Canvas/Controls/QuickDrawFloatingButtonControl.xaml.cs delete mode 100644 Ink Canvas/Windows/QuickDrawFloatingButton.cs diff --git a/Ink Canvas/Windows/QuickDrawFloatingButton.xaml b/Ink Canvas/Controls/QuickDrawFloatingButtonControl.xaml similarity index 86% rename from Ink Canvas/Windows/QuickDrawFloatingButton.xaml rename to Ink Canvas/Controls/QuickDrawFloatingButtonControl.xaml index 07786911..37a17947 100644 --- a/Ink Canvas/Windows/QuickDrawFloatingButton.xaml +++ b/Ink Canvas/Controls/QuickDrawFloatingButtonControl.xaml @@ -1,22 +1,19 @@ - - - + + + - + - + + diff --git a/Ink Canvas/Controls/QuickDrawFloatingButtonControl.xaml.cs b/Ink Canvas/Controls/QuickDrawFloatingButtonControl.xaml.cs new file mode 100644 index 00000000..c09e3f3b --- /dev/null +++ b/Ink Canvas/Controls/QuickDrawFloatingButtonControl.xaml.cs @@ -0,0 +1,149 @@ +using Ink_Canvas.Windows; +using System; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Input; +using System.Windows.Threading; +using MouseEventArgs = System.Windows.Input.MouseEventArgs; +using HorizontalAlignment = System.Windows.HorizontalAlignment; +using VerticalAlignment = System.Windows.VerticalAlignment; + +namespace Ink_Canvas.Controls +{ + /// + /// 快抽悬浮按钮控件 + /// + public partial class QuickDrawFloatingButtonControl : UserControl + { + private bool _isDragging = false; + private Point _dragStartPoint; + private Point _controlStartPoint; + + public QuickDrawFloatingButtonControl() + { + InitializeComponent(); + } + + /// + /// 快抽按钮点击事件 + /// + private void FloatingButton_Click(object sender, MouseButtonEventArgs e) + { + try + { + // 如果正在拖动，不触发点击事件 + if (_isDragging) return; + + // 打开快抽窗口 + var quickDrawWindow = new QuickDrawWindow(); + quickDrawWindow.ShowDialog(); + } + catch (Exception ex) + { + Helpers.LogHelper.WriteLogToFile($"打开快抽窗口失败: {ex.Message}", Helpers.LogHelper.LogType.Error); + } + } + + /// + /// 拖动区域鼠标按下事件 + /// + private void DragArea_MouseLeftButtonDown(object sender, MouseButtonEventArgs e) + { + _isDragging = false; + + // 记录鼠标在屏幕上的初始位置 + _dragStartPoint = this.PointToScreen(e.GetPosition(this)); + + // 记录控件的初始位置 + var parent = this.Parent as FrameworkElement; + if (parent != null) + { + var transform = this.TransformToVisual(parent); + var currentPos = transform.Transform(new Point(0, 0)); + _controlStartPoint = currentPos; + } + else + { + var currentMargin = this.Margin; + _controlStartPoint = new Point( + double.IsNaN(currentMargin.Left) ? 0 : currentMargin.Left, + double.IsNaN(currentMargin.Top) ? 0 : currentMargin.Top); + } + + ((UIElement)sender).CaptureMouse(); + e.Handled = true; + } + + /// + /// 拖动区域鼠标移动事件 + /// + private void DragArea_MouseMove(object sender, MouseEventArgs e) + { + if (e.LeftButton == MouseButtonState.Pressed && ((UIElement)sender).IsMouseCaptured) + { + // 获取鼠标在屏幕上的当前位置 + Point currentScreenPoint = this.PointToScreen(e.GetPosition(this)); + Vector diff = currentScreenPoint - _dragStartPoint; + + if (!_isDragging && (Math.Abs(diff.X) > 3 || Math.Abs(diff.Y) > 3)) + { + _isDragging = true; + // 切换到绝对定位模式 + this.HorizontalAlignment = HorizontalAlignment.Left; + this.VerticalAlignment = VerticalAlignment.Top; + } + + if (_isDragging) + { + // 计算新位置 + var parent = this.Parent as FrameworkElement; + if (parent != null) + { + // 计算屏幕坐标相对于父容器的位置 + var parentPoint = parent.PointFromScreen(currentScreenPoint); + var startParentPoint = parent.PointFromScreen(_dragStartPoint); + + // 计算相对于初始位置的偏移 + double offsetX = parentPoint.X - startParentPoint.X; + double offsetY = parentPoint.Y - startParentPoint.Y; + + // 新位置 = 初始位置 + 偏移 + double newLeft = _controlStartPoint.X + offsetX; + double newTop = _controlStartPoint.Y + offsetY; + + // 限制在父容器范围内 + newLeft = Math.Max(0, Math.Min(newLeft, parent.ActualWidth - this.ActualWidth)); + newTop = Math.Max(0, Math.Min(newTop, parent.ActualHeight - this.ActualHeight)); + + // 更新Margin + this.Margin = new Thickness(newLeft, newTop, 0, 0); + } + } + } + } + + /// + /// 拖动区域鼠标释放事件 + /// + private void DragArea_MouseLeftButtonUp(object sender, MouseButtonEventArgs e) + { + if (((UIElement)sender).IsMouseCaptured) + { + ((UIElement)sender).ReleaseMouseCapture(); + } + + if (_isDragging) + { + Dispatcher.BeginInvoke(new Action(() => { _isDragging = false; }), + DispatcherPriority.Background); + } + else + { + _isDragging = false; + } + + e.Handled = true; + } + } +} + diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml index 552989f3..daf5c125 100644 --- a/Ink Canvas/MainWindow.xaml +++ b/Ink Canvas/MainWindow.xaml @@ -6,6 +6,7 @@ xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern" xmlns:c="clr-namespace:Ink_Canvas.Converter" xmlns:Controls="http://schemas.microsoft.com/netfx/2009/xaml/presentation" + xmlns:controls="clr-namespace:Ink_Canvas.Controls" mc:Ignorable="d" AllowsTransparency="True" WindowStyle="None" @@ -3958,81 +3959,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Panel.ZIndex="1001"/> diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs index 665025df..bd52a3b6 100644 --- a/Ink Canvas/MainWindow.xaml.cs +++ b/Ink Canvas/MainWindow.xaml.cs @@ -63,10 +63,6 @@ namespace Ink_Canvas // 悬浮窗拦截管理器 private FloatingWindowInterceptorManager _floatingWindowInterceptorManager; - // 快抽悬浮按钮拖动相关 - private bool _quickDrawButtonIsDragging = false; - private Point _quickDrawButtonDragStartPoint; - private Point _quickDrawButtonWindowStartPoint; // 设置面板相关状态 private bool userChangedNoFocusModeInSettings; @@ -3083,7 +3079,7 @@ namespace Ink_Canvas { try { - var quickDrawButton = FindName("QuickDrawFloatingButton") as Border; + var quickDrawButton = FindName("QuickDrawFloatingButton") as Controls.QuickDrawFloatingButtonControl; if (quickDrawButton == null) return; // 检查设置是否启用快抽功能 @@ -3102,132 +3098,6 @@ namespace Ink_Canvas } } - /// - /// 快抽按钮点击事件 - /// - private void QuickDrawFloatingButton_Click(object sender, MouseButtonEventArgs e) - { - try - { - // 如果正在拖动，不触发点击事件 - if (_quickDrawButtonIsDragging) return; - - // 打开快抽窗口 - var quickDrawWindow = new QuickDrawWindow(); - quickDrawWindow.ShowDialog(); - } - catch (Exception ex) - { - LogHelper.WriteLogToFile($"打开快抽窗口失败: {ex.Message}", LogHelper.LogType.Error); - } - } - - /// - /// 快抽按钮拖动区域鼠标按下事件 - /// - private void QuickDrawFloatingButton_DragArea_MouseLeftButtonDown(object sender, MouseButtonEventArgs e) - { - _quickDrawButtonIsDragging = false; - var quickDrawButton = FindName("QuickDrawFloatingButton") as Border; - if (quickDrawButton == null) return; - - // 记录鼠标在屏幕上的初始位置 - _quickDrawButtonDragStartPoint = quickDrawButton.PointToScreen(e.GetPosition(quickDrawButton)); - - // 记录按钮的初始位置（相对于Grid） - var parentGrid = quickDrawButton.Parent as Grid; - if (parentGrid != null) - { - var transform = quickDrawButton.TransformToVisual(parentGrid); - var currentPos = transform.Transform(new Point(0, 0)); - _quickDrawButtonWindowStartPoint = currentPos; - } - else - { - var currentMargin = quickDrawButton.Margin; - _quickDrawButtonWindowStartPoint = new Point( - double.IsNaN(currentMargin.Left) ? 0 : currentMargin.Left, - double.IsNaN(currentMargin.Top) ? 0 : currentMargin.Top); - } - - ((UIElement)sender).CaptureMouse(); - e.Handled = true; - } - - /// - /// 快抽按钮拖动区域鼠标移动事件 - /// - private void QuickDrawFloatingButton_DragArea_MouseMove(object sender, MouseEventArgs e) - { - var quickDrawButton = FindName("QuickDrawFloatingButton") as Border; - if (quickDrawButton == null) return; - - if (e.LeftButton == MouseButtonState.Pressed && ((UIElement)sender).IsMouseCaptured) - { - // 获取鼠标在屏幕上的当前位置 - Point currentScreenPoint = quickDrawButton.PointToScreen(e.GetPosition(quickDrawButton)); - Vector diff = currentScreenPoint - _quickDrawButtonDragStartPoint; - - if (!_quickDrawButtonIsDragging && (Math.Abs(diff.X) > 3 || Math.Abs(diff.Y) > 3)) - { - _quickDrawButtonIsDragging = true; - // 切换到绝对定位模式 - quickDrawButton.HorizontalAlignment = HorizontalAlignment.Left; - quickDrawButton.VerticalAlignment = VerticalAlignment.Top; - } - - if (_quickDrawButtonIsDragging) - { - // 计算新位置 - var parentGrid = quickDrawButton.Parent as Grid; - if (parentGrid != null) - { - // 计算屏幕坐标相对于Grid的位置 - var gridPoint = parentGrid.PointFromScreen(currentScreenPoint); - var startGridPoint = parentGrid.PointFromScreen(_quickDrawButtonDragStartPoint); - - // 计算相对于初始位置的偏移 - double offsetX = gridPoint.X - startGridPoint.X; - double offsetY = gridPoint.Y - startGridPoint.Y; - - // 新位置 = 初始位置 + 偏移 - double newLeft = _quickDrawButtonWindowStartPoint.X + offsetX; - double newTop = _quickDrawButtonWindowStartPoint.Y + offsetY; - - // 限制在Grid范围内 - newLeft = Math.Max(0, Math.Min(newLeft, parentGrid.ActualWidth - quickDrawButton.ActualWidth)); - newTop = Math.Max(0, Math.Min(newTop, parentGrid.ActualHeight - quickDrawButton.ActualHeight)); - - // 更新Margin - quickDrawButton.Margin = new Thickness(newLeft, newTop, 0, 0); - } - } - } - } - - /// - /// 快抽按钮拖动区域鼠标释放事件 - /// - private void QuickDrawFloatingButton_DragArea_MouseLeftButtonUp(object sender, MouseButtonEventArgs e) - { - if (((UIElement)sender).IsMouseCaptured) - { - ((UIElement)sender).ReleaseMouseCapture(); - } - - if (_quickDrawButtonIsDragging) - { - Dispatcher.BeginInvoke(new Action(() => { _quickDrawButtonIsDragging = false; }), - DispatcherPriority.Background); - } - else - { - _quickDrawButtonIsDragging = false; - } - - e.Handled = true; - } - #endregion } diff --git a/Ink Canvas/Windows/QuickDrawFloatingButton.cs b/Ink Canvas/Windows/QuickDrawFloatingButton.cs deleted file mode 100644 index 062306bf..00000000 --- a/Ink Canvas/Windows/QuickDrawFloatingButton.cs +++ /dev/null @@ -1,355 +0,0 @@ -using Ink_Canvas.Helpers; -using System; -using System.Windows; -using System.Windows.Input; -using System.Windows.Interop; -using System.Windows.Media; -using System.Runtime.InteropServices; -using System.Windows.Threading; - -namespace Ink_Canvas -{ - /// - /// 快抽悬浮按钮 - /// - public partial class QuickDrawFloatingButton : Window - { - private bool isDragging = false; - private Point dragStartPoint; - private Point windowStartPoint; - - public QuickDrawFloatingButton() - { - InitializeComponent(); - - // 设置无焦点状态 - this.Focusable = false; - this.ShowInTaskbar = false; - - // 窗口句柄创建后应用无焦点模式 - this.SourceInitialized += QuickDrawFloatingButton_SourceInitialized; - } - - private void QuickDrawFloatingButton_SourceInitialized(object sender, EventArgs e) - { - ApplyNoFocusMode(); - } - - - private void FloatingButton_Loaded(object sender, RoutedEventArgs e) - { - // 设置位置到屏幕右下角稍微靠近中部 - SetPositionToBottomRight(); - - // 应用无焦点模式 - ApplyNoFocusMode(); - - // 应用置顶 - ApplyFloatingButtonTopmost(); - - if (MainWindow.Settings?.Advanced?.EnableUIAccessTopMost != true) - { - StartTopmostMaintenance(); - } - } - - private void SetPositionToBottomRight() - { - try - { - // 获取主屏幕的工作区域 - var workingArea = SystemParameters.WorkArea; - this.Left = workingArea.Right - this.Width - 0; - this.Top = workingArea.Bottom - this.Height - 200; - } - catch (Exception ex) - { - LogHelper.WriteLogToFile($"设置悬浮按钮位置失败: {ex.Message}", LogHelper.LogType.Error); - // 如果计算失败，使用默认位置 - this.Left = 720; - this.Top = 400; - } - } - - private void FloatingButton_Click(object sender, MouseButtonEventArgs e) - { - try - { - // 如果正在拖动，不触发点击事件 - if (isDragging) return; - - // 打开快抽窗口 - var quickDrawWindow = new QuickDrawWindow(); - quickDrawWindow.ShowDialog(); - } - catch (Exception ex) - { - LogHelper.WriteLogToFile($"打开快抽窗口失败: {ex.Message}", LogHelper.LogType.Error); - } - } - - private void DragArea_MouseLeftButtonDown(object sender, MouseButtonEventArgs e) - { - isDragging = false; - // 记录鼠标在屏幕上的初始位置 - dragStartPoint = this.PointToScreen(e.GetPosition(this)); - // 记录窗口的初始位置 - windowStartPoint = new Point(this.Left, this.Top); - ((UIElement)sender).CaptureMouse(); - e.Handled = true; - } - - private void DragArea_MouseMove(object sender, MouseEventArgs e) - { - if (e.LeftButton == MouseButtonState.Pressed && ((UIElement)sender).IsMouseCaptured) - { - // 获取鼠标在屏幕上的当前位置 - Point currentScreenPoint = this.PointToScreen(e.GetPosition(this)); - Vector diff = currentScreenPoint - dragStartPoint; - - if (!isDragging && (Math.Abs(diff.X) > 3 || Math.Abs(diff.Y) > 3)) - { - isDragging = true; - } - - if (isDragging) - { - // 使用窗口初始位置加上鼠标移动的距离 - double newLeft = windowStartPoint.X + diff.X; - double newTop = windowStartPoint.Y + diff.Y; - - // 限制在屏幕范围内 - var workingArea = SystemParameters.WorkArea; - newLeft = Math.Max(workingArea.Left, Math.Min(newLeft, workingArea.Right - this.Width)); - newTop = Math.Max(workingArea.Top, Math.Min(newTop, workingArea.Bottom - this.Height)); - - this.Left = newLeft; - this.Top = newTop; - } - } - } - - private void DragArea_MouseLeftButtonUp(object sender, MouseButtonEventArgs e) - { - if (((UIElement)sender).IsMouseCaptured) - { - ((UIElement)sender).ReleaseMouseCapture(); - } - - // 延迟重置拖动状态，避免触发点击事件 - if (isDragging) - { - Dispatcher.BeginInvoke(new Action(() => { isDragging = false; }), - DispatcherPriority.Background); - } - else - { - isDragging = false; - } - - e.Handled = true; - } - - - - - #region Win32 API 声明和置顶管理 - [DllImport("user32.dll")] - private static extern bool SetWindowPos(IntPtr hWnd, IntPtr hWndInsertAfter, int X, int Y, int cx, int cy, uint uFlags); - - [DllImport("user32.dll")] - private static extern int GetWindowLong(IntPtr hWnd, int nIndex); - - [DllImport("user32.dll")] - private static extern int SetWindowLong(IntPtr hWnd, int nIndex, int dwNewLong); - - [DllImport("user32.dll")] - private static extern bool IsWindow(IntPtr hWnd); - - [DllImport("user32.dll")] - [return: MarshalAs(UnmanagedType.Bool)] - private static extern bool IsWindowVisible(IntPtr hWnd); - - [DllImport("user32.dll")] - private static extern bool IsIconic(IntPtr hWnd); - - [DllImport("user32.dll")] - private static extern IntPtr GetForegroundWindow(); - - [DllImport("user32.dll")] - private static extern uint GetWindowThreadProcessId(IntPtr hWnd, out uint lpdwProcessId); - - [DllImport("kernel32.dll")] - private static extern uint GetCurrentProcessId(); - - private const int GWL_EXSTYLE = -20; - private const int WS_EX_NOACTIVATE = 0x08000000; - private const int WS_EX_TOPMOST = 0x00000008; - private static readonly IntPtr HWND_TOPMOST = new IntPtr(-1); - private static readonly IntPtr HWND_NOTOPMOST = new IntPtr(-2); - private const uint SWP_NOMOVE = 0x0002; - private const uint SWP_NOSIZE = 0x0001; - private const uint SWP_NOACTIVATE = 0x0010; - private const uint SWP_SHOWWINDOW = 0x0040; - private const uint SWP_NOOWNERZORDER = 0x0200; - - // 添加定时器来维护置顶状态 - private DispatcherTimer topmostMaintenanceTimer; - private bool isTopmostMaintenanceEnabled; - - /// - /// 应用无焦点模式 - /// - private void ApplyNoFocusMode() - { - try - { - var hwnd = new WindowInteropHelper(this).Handle; - if (hwnd == IntPtr.Zero) return; - - int exStyle = GetWindowLong(hwnd, GWL_EXSTYLE); - - // 悬浮快抽窗口始终启用无焦点模式 - SetWindowLong(hwnd, GWL_EXSTYLE, exStyle | WS_EX_NOACTIVATE); - } - catch (Exception) - { - } - } - - /// - /// 应用悬浮按钮置顶 - /// - private void ApplyFloatingButtonTopmost() - { - try - { - var hwnd = new WindowInteropHelper(this).Handle; - if (hwnd == IntPtr.Zero) return; - // 设置WPF的Topmost属性 - Topmost = true; - - // 使用Win32 API强制置顶 - // 1. 设置窗口样式为置顶 - int exStyle = GetWindowLong(hwnd, GWL_EXSTYLE); - SetWindowLong(hwnd, GWL_EXSTYLE, exStyle | WS_EX_TOPMOST); - - // 2. 使用SetWindowPos确保窗口在最顶层 - SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0, - SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE | SWP_SHOWWINDOW | SWP_NOOWNERZORDER); - - } - catch (Exception ex) - { - LogHelper.WriteLogToFile($"应用快抽悬浮按钮置顶失败: {ex.Message}", LogHelper.LogType.Error); - } - } - - /// - /// 启动置顶维护定时器 - /// - private void StartTopmostMaintenance() - { - if (MainWindow.Settings?.Advanced?.EnableUIAccessTopMost == true) - { - return; - } - - if (isTopmostMaintenanceEnabled) return; - - if (topmostMaintenanceTimer == null) - { - topmostMaintenanceTimer = new DispatcherTimer(); - topmostMaintenanceTimer.Interval = TimeSpan.FromMilliseconds(500); // 每500ms检查一次 - topmostMaintenanceTimer.Tick += TopmostMaintenanceTimer_Tick; - } - - topmostMaintenanceTimer.Start(); - isTopmostMaintenanceEnabled = true; - } - - /// - /// 停止置顶维护定时器 - /// - private void StopTopmostMaintenance() - { - if (topmostMaintenanceTimer != null && isTopmostMaintenanceEnabled) - { - topmostMaintenanceTimer.Stop(); - isTopmostMaintenanceEnabled = false; - } - } - - /// - /// 置顶维护定时器事件 - /// - private void TopmostMaintenanceTimer_Tick(object sender, EventArgs e) - { - try - { - if (MainWindow.Settings?.Advanced?.EnableUIAccessTopMost == true) - { - StopTopmostMaintenance(); - return; - } - - // 悬浮快抽窗口始终启用无焦点模式，不需要检查主窗口设置 - - var hwnd = new WindowInteropHelper(this).Handle; - if (hwnd == IntPtr.Zero) return; - - // 检查窗口是否仍然可见且不是最小化状态 - if (!IsWindow(hwnd) || !IsWindowVisible(hwnd) || IsIconic(hwnd)) - { - return; - } - - // 检查是否有子窗口在前景 - var foregroundWindow = GetForegroundWindow(); - if (foregroundWindow != hwnd) - { - // 检查前景窗口是否是当前应用程序的子窗口 - var foregroundWindowProcessId = GetWindowThreadProcessId(foregroundWindow, out uint processId); - var currentProcessId = GetCurrentProcessId(); - - if (processId == currentProcessId) - { - // 如果有子窗口在前景，暂停置顶维护 - return; - } - - // 如果窗口不在最顶层且没有子窗口，重新设置置顶 - SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0, - SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE | SWP_SHOWWINDOW | SWP_NOOWNERZORDER); - - // 确保窗口样式正确 - int exStyle = GetWindowLong(hwnd, GWL_EXSTYLE); - if ((exStyle & WS_EX_TOPMOST) == 0) - { - SetWindowLong(hwnd, GWL_EXSTYLE, exStyle | WS_EX_TOPMOST); - } - - // 确保无焦点模式样式正确 - if ((exStyle & WS_EX_NOACTIVATE) == 0) - { - SetWindowLong(hwnd, GWL_EXSTYLE, exStyle | WS_EX_NOACTIVATE); - } - } - } - catch (Exception ex) - { - LogHelper.WriteLogToFile($"快抽悬浮按钮置顶维护定时器出错: {ex.Message}", LogHelper.LogType.Error); - } - } - - /// - /// 窗口关闭时停止置顶维护定时器 - /// - protected override void OnClosed(EventArgs e) - { - StopTopmostMaintenance(); - base.OnClosed(e); - } - #endregion - } -}