From 3ae99c82cc222ba01251825800cdf648b908488e Mon Sep 17 00:00:00 2001 From: doudou0720 <98651603+doudou0720@users.noreply.github.com> Date: Sat, 21 Mar 2026 22:15:36 +0800 Subject: [PATCH] =?UTF-8?q?fix(SymbolIcon):=E4=BF=AE=E5=A4=8DSymbolIcon?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=B9=B6=E4=BF=AE=E6=94=B9=E6=89=93=E5=8C=85?= =?UTF-8?q?=E8=BF=87=E7=A8=8B=E4=BB=A5=E6=AD=A3=E7=A1=AE=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E5=8D=95=E6=96=87=E4=BB=B6=E7=A8=8B=E5=BA=8F=20(#407)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refactor(Icon): 将SymbolIcon替换为FontIcon以使用Segoe Fluent Icons Signed-off-by: doudou0720 <98651603+doudou0720@users.noreply.github.com> * chore: 移除 Costura.Fody 的 IncludeAssets 配置 Signed-off-by: doudou0720 <98651603+doudou0720@users.noreply.github.com> --------- Signed-off-by: doudou0720 <98651603+doudou0720@users.noreply.github.com> --- Ink Canvas/InkCanvasForClass.csproj | 1 - Ink Canvas/MainWindow.xaml | 14 +++++++------- Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs | 5 +++-- Ink Canvas/Windows/CountdownTimerWindow.xaml | 18 +++++++++--------- .../Windows/CountdownTimerWindow.xaml.cs | 15 ++++++++------- Ink Canvas/Windows/HistoryRollbackWindow.xaml | 2 +- Ink Canvas/Windows/OperatingGuideWindow.xaml | 6 +++--- .../Windows/OperatingGuideWindow.xaml.cs | 5 +++-- Ink Canvas/Windows/RandWindow.xaml | 10 +++++----- Ink Canvas/Windows/RandWindow.xaml.cs | 5 +++-- .../Windows/YesOrNoNotificationWindow.xaml | 4 ++-- 11 files changed, 44 insertions(+), 41 deletions(-) diff --git a/Ink Canvas/InkCanvasForClass.csproj b/Ink Canvas/InkCanvasForClass.csproj index ad9c2fff..f467caf7 100644 --- a/Ink Canvas/InkCanvasForClass.csproj +++ b/Ink Canvas/InkCanvasForClass.csproj @@ -147,7 +147,6 @@ all - runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml index fad91b88..10158954 100644 --- a/Ink Canvas/MainWindow.xaml +++ b/Ink Canvas/MainWindow.xaml @@ -5141,7 +5141,7 @@ Click="WhiteBoardPageListItem_DeleteClick" Background="#CC000000" Foreground="White" BorderThickness="0" Padding="0" Cursor="Hand"> - + @@ -6633,7 +6633,7 @@ - - + @@ -7370,7 +7370,7 @@ Width="50" Height="48" FontSize="26" Click="BtnWhiteBoardAdd_Click" Foreground="{Binding ElementName=BtnExit, Path=Foreground}" Background="{Binding ElementName=BtnExit, Path=Background}"> - + @@ -7557,7 +7557,7 @@ Background="{Binding ElementName=BtnExit, Path=Background}" IsEnabled="False" Visibility="Collapsed" IsEnabledChanged="Btn_IsEnabledChanged"> - + @@ -7567,7 +7567,7 @@ Background="{Binding ElementName=BtnExit, Path=Background}" IsEnabled="False" Visibility="Collapsed" IsEnabledChanged="Btn_IsEnabledChanged"> - + diff --git a/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs b/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs index b18958ec..1fdc9dcf 100644 --- a/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs +++ b/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs @@ -1,5 +1,6 @@ using Ink_Canvas.Helpers; using iNKORE.UI.WPF.Modern.Controls; +using iNKORE.UI.WPF.Modern.Common.IconKeys; using System; using System.Collections.Generic; using System.Diagnostics; @@ -113,9 +114,9 @@ namespace Ink_Canvas ToggleSwitchDrawShapeBorderAutoHide.IsOn = !ToggleSwitchDrawShapeBorderAutoHide.IsOn; if (ToggleSwitchDrawShapeBorderAutoHide.IsOn) - ((SymbolIcon)sender).Symbol = Symbol.Pin; + ((FontIcon)sender).Icon = SegoeFluentIcons.Pin; else - ((SymbolIcon)sender).Symbol = Symbol.UnPin; + ((FontIcon)sender).Icon = SegoeFluentIcons.Unpin; } /// diff --git a/Ink Canvas/Windows/CountdownTimerWindow.xaml b/Ink Canvas/Windows/CountdownTimerWindow.xaml index 0ab8ad45..ec8c4700 100644 --- a/Ink Canvas/Windows/CountdownTimerWindow.xaml +++ b/Ink Canvas/Windows/CountdownTimerWindow.xaml @@ -1,4 +1,4 @@ - - + @@ -181,12 +181,12 @@ - + - + @@ -196,12 +196,12 @@ - + - + @@ -217,7 +217,7 @@ - + - + - + diff --git a/Ink Canvas/Windows/CountdownTimerWindow.xaml.cs b/Ink Canvas/Windows/CountdownTimerWindow.xaml.cs index 92e419bf..e9bb5dac 100644 --- a/Ink Canvas/Windows/CountdownTimerWindow.xaml.cs +++ b/Ink Canvas/Windows/CountdownTimerWindow.xaml.cs @@ -1,4 +1,5 @@ using Ink_Canvas.Helpers; +using iNKORE.UI.WPF.Modern.Common.IconKeys; using System; using System.Media; using System.Timers; @@ -75,7 +76,7 @@ namespace Ink_Canvas TextBlockSecond.Text = "00"; timer.Stop(); isTimerRunning = false; - SymbolIconStart.Symbol = iNKORE.UI.WPF.Modern.Controls.Symbol.Play; + FontIconStart.Icon = SegoeFluentIcons.Play; BtnStartCover.Visibility = Visibility.Visible; var textForeground = Application.Current.FindResource("TimerWindowTextForeground") as SolidColorBrush; if (textForeground != null) @@ -264,12 +265,12 @@ namespace Ink_Canvas if (WindowState == WindowState.Normal) { WindowState = WindowState.Maximized; - SymbolIconFullscreen.Symbol = iNKORE.UI.WPF.Modern.Controls.Symbol.BackToWindow; + FontIconFullscreen.Icon = SegoeFluentIcons.BackToWindow; } else { WindowState = WindowState.Normal; - SymbolIconFullscreen.Symbol = iNKORE.UI.WPF.Modern.Controls.Symbol.FullScreen; + FontIconFullscreen.Icon = SegoeFluentIcons.FullScreen; } } @@ -305,7 +306,7 @@ namespace Ink_Canvas TextBlockHour.Foreground = textForeground3; else TextBlockHour.Foreground = new SolidColorBrush(StringToColor("#FF5B5D5F")); - SymbolIconStart.Symbol = iNKORE.UI.WPF.Modern.Controls.Symbol.Play; + FontIconStart.Icon = SegoeFluentIcons.Play; isTimerRunning = false; timer.Stop(); isPaused = false; @@ -362,7 +363,7 @@ namespace Ink_Canvas TextBlockHour.Foreground = textForeground1; else TextBlockHour.Foreground = Brushes.Black; - SymbolIconStart.Symbol = iNKORE.UI.WPF.Modern.Controls.Symbol.Pause; + FontIconStart.Icon = SegoeFluentIcons.Pause; isPaused = false; timer.Start(); UpdateStopTime(); @@ -378,7 +379,7 @@ namespace Ink_Canvas TextBlockHour.Foreground = textForeground3; else TextBlockHour.Foreground = new SolidColorBrush(StringToColor("#FF5B5D5F")); - SymbolIconStart.Symbol = iNKORE.UI.WPF.Modern.Controls.Symbol.Play; + FontIconStart.Icon = SegoeFluentIcons.Play; BorderStopTime.Visibility = Visibility.Collapsed; isPaused = true; timer.Stop(); @@ -394,7 +395,7 @@ namespace Ink_Canvas TextBlockHour.Foreground = textForeground2; else TextBlockHour.Foreground = Brushes.Black; - SymbolIconStart.Symbol = iNKORE.UI.WPF.Modern.Controls.Symbol.Pause; + FontIconStart.Icon = SegoeFluentIcons.Pause; BtnResetCover.Visibility = Visibility.Collapsed; if (totalSeconds <= 10) diff --git a/Ink Canvas/Windows/HistoryRollbackWindow.xaml b/Ink Canvas/Windows/HistoryRollbackWindow.xaml index 5d8cc86a..e2aa7b1a 100644 --- a/Ink Canvas/Windows/HistoryRollbackWindow.xaml +++ b/Ink Canvas/Windows/HistoryRollbackWindow.xaml @@ -33,7 +33,7 @@ - diff --git a/Ink Canvas/Windows/OperatingGuideWindow.xaml b/Ink Canvas/Windows/OperatingGuideWindow.xaml index 953d2a90..c911ada8 100644 --- a/Ink Canvas/Windows/OperatingGuideWindow.xaml +++ b/Ink Canvas/Windows/OperatingGuideWindow.xaml @@ -1,4 +1,4 @@ - - + - + diff --git a/Ink Canvas/Windows/OperatingGuideWindow.xaml.cs b/Ink Canvas/Windows/OperatingGuideWindow.xaml.cs index c21f7b57..823151bb 100644 --- a/Ink Canvas/Windows/OperatingGuideWindow.xaml.cs +++ b/Ink Canvas/Windows/OperatingGuideWindow.xaml.cs @@ -1,5 +1,6 @@ using Ink_Canvas.Helpers; using iNKORE.UI.WPF.Modern; +using iNKORE.UI.WPF.Modern.Common.IconKeys; using System; using System.Windows; using System.Windows.Input; @@ -32,12 +33,12 @@ namespace Ink_Canvas if (WindowState == WindowState.Normal) { WindowState = WindowState.Maximized; - SymbolIconFullscreen.Symbol = iNKORE.UI.WPF.Modern.Controls.Symbol.BackToWindow; + FontIconFullscreen.Icon = SegoeFluentIcons.BackToWindow; } else { WindowState = WindowState.Normal; - SymbolIconFullscreen.Symbol = iNKORE.UI.WPF.Modern.Controls.Symbol.FullScreen; + FontIconFullscreen.Icon = SegoeFluentIcons.FullScreen; } } diff --git a/Ink Canvas/Windows/RandWindow.xaml b/Ink Canvas/Windows/RandWindow.xaml index 782bc920..ff7bf4b6 100644 --- a/Ink Canvas/Windows/RandWindow.xaml +++ b/Ink Canvas/Windows/RandWindow.xaml @@ -1,4 +1,4 @@ - - + @@ -116,7 +116,7 @@ - + @@ -130,7 +130,7 @@ - + @@ -140,7 +140,7 @@ - + diff --git a/Ink Canvas/Windows/RandWindow.xaml.cs b/Ink Canvas/Windows/RandWindow.xaml.cs index 5137f835..37901963 100644 --- a/Ink Canvas/Windows/RandWindow.xaml.cs +++ b/Ink Canvas/Windows/RandWindow.xaml.cs @@ -1,5 +1,6 @@ using Ink_Canvas.Helpers; using iNKORE.UI.WPF.Modern.Controls; +using iNKORE.UI.WPF.Modern.Common.IconKeys; using Microsoft.VisualBasic; using System; using System.Collections.Generic; @@ -185,7 +186,7 @@ namespace Ink_Canvas if (RandMaxPeopleOneTime != -1 && TotalCount >= RandMaxPeopleOneTime) return; TotalCount++; LabelNumberCount.Text = TotalCount.ToString(); - SymbolIconStart.Symbol = Symbol.People; + FontIconStart.Icon = SegoeFluentIcons.People; BorderBtnAdd.Opacity = 1; BorderBtnMinus.Opacity = 1; } @@ -197,7 +198,7 @@ namespace Ink_Canvas LabelNumberCount.Text = TotalCount.ToString(); if (TotalCount == 1) { - SymbolIconStart.Symbol = Symbol.Contact; + FontIconStart.Icon = SegoeFluentIcons.Contact; } } diff --git a/Ink Canvas/Windows/YesOrNoNotificationWindow.xaml b/Ink Canvas/Windows/YesOrNoNotificationWindow.xaml index 1ba05f66..ead060d0 100644 --- a/Ink Canvas/Windows/YesOrNoNotificationWindow.xaml +++ b/Ink Canvas/Windows/YesOrNoNotificationWindow.xaml @@ -1,4 +1,4 @@ - - +