From a7fe7937a5197e31b7b85ecd3dab5751ffa5c17a Mon Sep 17 00:00:00 2001 From: PrefacedCorg <1876568293@qq.com> Date: Sat, 11 Apr 2026 12:44:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E6=B5=AE=E5=8A=A8=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E6=A0=8F=E4=BD=BF=E7=94=A8=E6=96=B0=E6=8E=A7=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ink Canvas/MainWindow.xaml | 142 +++--------------- Ink Canvas/MainWindow_cs/MW_AutoTheme.cs | 60 ++++---- .../MainWindow_cs/MW_FloatingBarIcons.cs | 53 +++---- Ink Canvas/MainWindow_cs/MW_Settings.cs | 20 +-- 4 files changed, 86 insertions(+), 189 deletions(-) diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml index 6f75af70..c051c581 100644 --- a/Ink Canvas/MainWindow.xaml +++ b/Ink Canvas/MainWindow.xaml @@ -7351,52 +7351,16 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + /// 发送者 /// 鼠标按钮事件参数 - internal void SymbolIconSelect_MouseUp(object sender, MouseButtonEventArgs e) + internal void SymbolIconSelect_MouseUp(object sender, RoutedEventArgs e) { if (lastBorderMouseDownObject is Panel panel) panel.Background = new SolidColorBrush(Colors.Transparent); - if (sender == SymbolIconSelect && lastBorderMouseDownObject != SymbolIconSelect) return; BtnSelect_Click(null, null); @@ -1033,10 +1032,8 @@ namespace Ink_Canvas else if (sender is Border border) { lastBorderMouseDownObject = sender; - // 对于快捷调色板的颜色球，不改变背景颜色，只添加透明度效果 if (border.Name?.StartsWith("QuickColor") == true) { - // 保存原始颜色并添加透明度 if (border.Background is SolidColorBrush originalColor) { border.Background = new SolidColorBrush(Color.FromArgb(180, originalColor.Color.R, originalColor.Color.G, originalColor.Color.B)); @@ -2146,7 +2143,6 @@ namespace Ink_Canvas { if (lastBorderMouseDownObject is Panel panel) panel.Background = new SolidColorBrush(Colors.Transparent); - if (sender == Cursor_Icon && lastBorderMouseDownObject != Cursor_Icon) return; // 禁用高级橡皮擦系统 DisableEraserOverlay(); @@ -2260,10 +2256,8 @@ namespace Ink_Canvas /// 路由事件参数 internal void PenIcon_Click(object sender, RoutedEventArgs e) { - if (lastBorderMouseDownObject is Panel panel) panel.Background = new SolidColorBrush(Colors.Transparent); - if (sender == Pen_Icon && lastBorderMouseDownObject != Pen_Icon) return; // 如果当前有选中的图片元素，先取消选中 if (currentSelectedElement != null) @@ -2617,11 +2611,6 @@ namespace Ink_Canvas /// 路由事件参数 private void EraserIconByStrokes_Click(object sender, RoutedEventArgs e) { - - if (lastBorderMouseDownObject is Panel panel) - panel.Background = new SolidColorBrush(Colors.Transparent); - if (sender == EraserByStrokes_Icon && lastBorderMouseDownObject != EraserByStrokes_Icon) return; - // 禁用高级橡皮擦系统 DisableEraserOverlay(); diff --git a/Ink Canvas/MainWindow_cs/MW_Settings.cs b/Ink Canvas/MainWindow_cs/MW_Settings.cs index 39d4e7e8..e150e1c0 100644 --- a/Ink Canvas/MainWindow_cs/MW_Settings.cs +++ b/Ink Canvas/MainWindow_cs/MW_Settings.cs @@ -4730,54 +4730,54 @@ namespace Ink_Canvas if (Settings.Appearance.UseLegacyFloatingBarUI) { - CursorIconGeometry.Geometry = Geometry.Parse( + Cursor_Icon.Icon.Geometry = Geometry.Parse( isCursorSolid ? XamlGraphicsIconGeometries.LegacySolidCursorIcon : XamlGraphicsIconGeometries.LegacyLinedCursorIcon); - PenIconGeometry.Geometry = Geometry.Parse( + Pen_Icon.Icon.Geometry = Geometry.Parse( isPenSolid ? XamlGraphicsIconGeometries.LegacySolidPenIcon : XamlGraphicsIconGeometries.LegacyLinedPenIcon); - StrokeEraserIconGeometry.Geometry = Geometry.Parse( + EraserByStrokes_Icon.Icon.Geometry = Geometry.Parse( isStrokeEraserSolid ? XamlGraphicsIconGeometries.LegacySolidEraserStrokeIcon : XamlGraphicsIconGeometries.LegacyLinedEraserStrokeIcon); - CircleEraserIconGeometry.Geometry = Geometry.Parse( + Eraser_Icon.Icon.Geometry = Geometry.Parse( isCircleEraserSolid ? XamlGraphicsIconGeometries.LegacySolidEraserCircleIcon : XamlGraphicsIconGeometries.LegacyLinedEraserCircleIcon); - LassoSelectIconGeometry.Geometry = Geometry.Parse( + SymbolIconSelect.Icon.Geometry = Geometry.Parse( isLassoSolid ? XamlGraphicsIconGeometries.LegacySolidLassoSelectIcon : XamlGraphicsIconGeometries.LegacyLinedLassoSelectIcon); } else { - CursorIconGeometry.Geometry = Geometry.Parse( + Cursor_Icon.Icon.Geometry = Geometry.Parse( isCursorSolid ? XamlGraphicsIconGeometries.SolidCursorIcon : XamlGraphicsIconGeometries.LinedCursorIcon); - PenIconGeometry.Geometry = Geometry.Parse( + Pen_Icon.Icon.Geometry = Geometry.Parse( isPenSolid ? XamlGraphicsIconGeometries.SolidPenIcon : XamlGraphicsIconGeometries.LinedPenIcon); - StrokeEraserIconGeometry.Geometry = Geometry.Parse( + EraserByStrokes_Icon.Icon.Geometry = Geometry.Parse( isStrokeEraserSolid ? XamlGraphicsIconGeometries.SolidEraserStrokeIcon : XamlGraphicsIconGeometries.LinedEraserStrokeIcon); - CircleEraserIconGeometry.Geometry = Geometry.Parse( + Eraser_Icon.Icon.Geometry = Geometry.Parse( isCircleEraserSolid ? XamlGraphicsIconGeometries.SolidEraserCircleIcon : XamlGraphicsIconGeometries.LinedEraserCircleIcon); - LassoSelectIconGeometry.Geometry = Geometry.Parse( + SymbolIconSelect.Icon.Geometry = Geometry.Parse( isLassoSolid ? XamlGraphicsIconGeometries.SolidLassoSelectIcon : XamlGraphicsIconGeometries.LinedLassoSelectIcon);