From dbac80509aca47c9fcae39774403a4241014b42c Mon Sep 17 00:00:00 2001 From: PrefacedCorg <1876568293@qq.com> Date: Sat, 11 Apr 2026 17:18:51 +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/Controls/ToolbarImageButton.xaml.cs | 10 ++++++++++ Ink Canvas/MainWindow.xaml | 1 + Ink Canvas/MainWindow_cs/MW_AutoTheme.cs | 2 -- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Ink Canvas/Controls/ToolbarImageButton.xaml.cs b/Ink Canvas/Controls/ToolbarImageButton.xaml.cs index 8c52132b..9892a099 100644 --- a/Ink Canvas/Controls/ToolbarImageButton.xaml.cs +++ b/Ink Canvas/Controls/ToolbarImageButton.xaml.cs @@ -43,6 +43,16 @@ namespace Ink_Canvas.Controls public GeometryDrawing GeometryDrawing => IconGeometryInternal; + public static readonly DependencyProperty IconBrushProperty = DependencyProperty.Register( + nameof(IconBrush), typeof(Brush), typeof(ToolbarImageButton), + new PropertyMetadata(null, (d, e) => ((ToolbarImageButton)d).IconGeometryInternal.Brush = (Brush)e.NewValue)); + + public Brush IconBrush + { + get => (Brush)GetValue(IconBrushProperty); + set => SetValue(IconBrushProperty, value); + } + public new Brush Background { get => ButtonPanel.Background; diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml index c08fd967..ed62b2db 100644 --- a/Ink Canvas/MainWindow.xaml +++ b/Ink Canvas/MainWindow.xaml @@ -7939,6 +7939,7 @@ ButtonMouseDown="FloatingBarToolBtnMouseDownFeedback_Panel" ButtonMouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel" ButtonMouseUp="SymbolIconDelete_MouseUp" + IconBrush="{DynamicResource RedBrush}" Label="{i18n:I18n Key=FloatingBar_Clear}" /> diff --git a/Ink Canvas/MainWindow_cs/MW_AutoTheme.cs b/Ink Canvas/MainWindow_cs/MW_AutoTheme.cs index 58458cd0..a0476bfa 100644 --- a/Ink Canvas/MainWindow_cs/MW_AutoTheme.cs +++ b/Ink Canvas/MainWindow_cs/MW_AutoTheme.cs @@ -173,8 +173,6 @@ namespace Ink_Canvas SetAllFloatingBarButtonsToColor(FloatBarForegroundColor); - SymbolIconDelete.Icon.Brush = new SolidColorBrush(Color.FromRgb(239, 68, 68)); - switch (_currentToolMode) { case "cursor":