From 42854ff9241cf6decc91b94df4e3c95a94c532e1 Mon Sep 17 00:00:00 2001
From: PrefacedCorg <1876568293@qq.com>
Date: Fri, 24 Apr 2026 07:39:31 +0800
Subject: [PATCH] =?UTF-8?q?style(SettingsViews):=20=E4=B8=BAXAML=E6=96=87?=
=?UTF-8?q?=E4=BB=B6=E6=B7=BB=E5=8A=A0=E8=AE=BE=E8=AE=A1=E6=97=B6=E5=B1=9E?=
=?UTF-8?q?=E6=80=A7=E5=92=8C=E4=BF=AE=E5=A4=8D=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
为多个设置页面添加d:IsExpanded和d:Visibility设计时属性
修复AboutPage.xaml的BOM头问题
统一SettingsExpander的格式
---
.gitignore | 3 ++-
.../SettingsViews/Pages/AboutPage.xaml | 8 +++---
.../SettingsViews/Pages/CanvasPage.xaml | 26 ++++++++++++++-----
.../SettingsViews/Pages/IconographyPage.xaml | 3 ++-
.../SettingsViews/Pages/StartupPage.xaml | 3 ++-
.../SettingsViews/Pages/UpdatePage.xaml | 5 +++-
6 files changed, 34 insertions(+), 14 deletions(-)
diff --git a/.gitignore b/.gitignore
index 5cec64f6..d0885ead 100644
--- a/.gitignore
+++ b/.gitignore
@@ -429,4 +429,5 @@ FodyWeavers.xsd
# Telemetry DSN configuration file (contains sensitive information)
telemetry_dsn.txt
-**/telemetry_dsn.txt
\ No newline at end of file
+**/telemetry_dsn.txt
+.trae/skills/migrate-toggle-switch/SKILL.md
diff --git a/Ink Canvas/Windows/SettingsViews/Pages/AboutPage.xaml b/Ink Canvas/Windows/SettingsViews/Pages/AboutPage.xaml
index 192a2d5d..a8894441 100644
--- a/Ink Canvas/Windows/SettingsViews/Pages/AboutPage.xaml
+++ b/Ink Canvas/Windows/SettingsViews/Pages/AboutPage.xaml
@@ -1,4 +1,4 @@
-
-
+
@@ -91,7 +92,8 @@
-
+
diff --git a/Ink Canvas/Windows/SettingsViews/Pages/CanvasPage.xaml b/Ink Canvas/Windows/SettingsViews/Pages/CanvasPage.xaml
index 965566eb..b4c32ed4 100644
--- a/Ink Canvas/Windows/SettingsViews/Pages/CanvasPage.xaml
+++ b/Ink Canvas/Windows/SettingsViews/Pages/CanvasPage.xaml
@@ -144,7 +144,8 @@
Toggled="ToggleSwitchEnableInkFade_Toggled" />
+ Visibility="{Binding IsOn, ElementName=CardEnableInkFade, Converter={StaticResource BooleanToVisibilityConverter}}"
+ d:Visibility="Visible">
@@ -172,7 +173,9 @@
Toggled="ToggleSwitchBrushAutoRestore_Toggled" />
+ Visibility="{Binding IsOn, ElementName=CardBrushAutoRestore, Converter={StaticResource BooleanToVisibilityConverter}}"
+ d:Visibility="Visible"
+ d:IsExpanded="True">
@@ -225,7 +228,8 @@
+ Visibility="{Binding IsOn, ElementName=CardEnableEraserAutoSwitchBack, Converter={StaticResource BooleanToVisibilityConverter}}"
+ d:Visibility="Visible">
@@ -271,12 +276,15 @@
+ Visibility="{Binding IsOn, ElementName=CardEnableInkToShape, Converter={StaticResource BooleanToVisibilityConverter}}"
+ d:Visibility="Visible"
+ d:IsExpanded="True">
@@ -306,7 +314,8 @@
Toggled="ToggleSwitchAutoStraightenLine_Toggled" />
+ Visibility="{Binding IsOn, ElementName=CardAutoStraightenLine, Converter={StaticResource BooleanToVisibilityConverter}}"
+ d:Visibility="Visible">
+ Visibility="{Binding IsOn, ElementName=CardAutoStraightenLine, Converter={StaticResource BooleanToVisibilityConverter}}"
+ d:Visibility="Visible">
@@ -343,7 +354,8 @@
+ Visibility="{Binding IsOn, ElementName=CardLineEndpointSnapping, Converter={StaticResource BooleanToVisibilityConverter}}"
+ d:Visibility="Visible">
+ Header="SettingsExpander" IsEnabled="True"
+ d:IsExpanded="True">
diff --git a/Ink Canvas/Windows/SettingsViews/Pages/StartupPage.xaml b/Ink Canvas/Windows/SettingsViews/Pages/StartupPage.xaml
index 666fbcdc..806f4023 100644
--- a/Ink Canvas/Windows/SettingsViews/Pages/StartupPage.xaml
+++ b/Ink Canvas/Windows/SettingsViews/Pages/StartupPage.xaml
@@ -56,7 +56,8 @@
+ Description="{i18n:I18n Key=Startup_TopMostHint}"
+ d:IsExpanded="True">
diff --git a/Ink Canvas/Windows/SettingsViews/Pages/UpdatePage.xaml b/Ink Canvas/Windows/SettingsViews/Pages/UpdatePage.xaml
index bda96d59..068b48c5 100644
--- a/Ink Canvas/Windows/SettingsViews/Pages/UpdatePage.xaml
+++ b/Ink Canvas/Windows/SettingsViews/Pages/UpdatePage.xaml
@@ -48,11 +48,14 @@
Icon="{x:Static ui:SegoeFluentIcons.QuietHours}"
SwitchName="ToggleSwitchIsAutoUpdateWithSilence"
ShowWhen="{Binding IsOn, ElementName=CardAutoUpdate}"
+ d:Visibility="Visible"
Toggled="ToggleSwitchIsAutoUpdateWithSilence_Toggled" />
+ Visibility="{Binding IsOn, ElementName=CardSilentUpdate, Converter={StaticResource BooleanToVisibilityConverter}}"
+ d:Visibility="Visible"
+ d:IsExpanded="True">