From 3ab9fcc857a8ebb9d402453968d148f8a61dfbae Mon Sep 17 00:00:00 2001
From: PrefacedCorg <1876568293@qq.com>
Date: Sun, 26 Apr 2026 20:26:24 +0800
Subject: [PATCH] =?UTF-8?q?refactor(UI):=20=E9=87=8D=E6=9E=84=E6=82=AC?=
 =?UTF-8?q?=E6=B5=AE=E7=AA=97=E6=8B=A6=E6=88=AA=E8=AE=BE=E7=BD=AE=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将悬浮窗拦截设置从LabeledSettingsCard改为SettingsCard和ToggleSwitch组合
优化界面结构，使开关控件更直观
添加Expander控制拦截规则的显示状态
---
 .../SettingsViews/Pages/AutomationPage.xaml   | 188 ++++++++++++------
 .../Pages/AutomationPage.xaml.cs              |  58 +++---
 .../SettingsViews/Pages/PowerPointPage.xaml   |   2 +
 3 files changed, 158 insertions(+), 90 deletions(-)

diff --git a/Ink Canvas/Windows/SettingsViews/Pages/AutomationPage.xaml b/Ink Canvas/Windows/SettingsViews/Pages/AutomationPage.xaml
index f89203c1..95649ed0 100644
--- a/Ink Canvas/Windows/SettingsViews/Pages/AutomationPage.xaml	
+++ b/Ink Canvas/Windows/SettingsViews/Pages/AutomationPage.xaml	
@@ -8,6 +8,7 @@
       xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
       xmlns:i18n="clr-namespace:Ink_Canvas.MarkupExtensions"
       xmlns:controls="clr-namespace:Ink_Canvas.Controls;assembly=InkCanvas.Controls"
+      xmlns:c="clr-namespace:Ink_Canvas.Converter"
       xmlns:sys="clr-namespace:System;assembly=mscorlib"
       mc:Ignorable="d"
       Title="自动化">
@@ -17,6 +18,7 @@
             <FrameworkElement.Resources>
                 <sys:Double x:Key="SettingsCardSpacing">4</sys:Double>
                 <sys:Double x:Key="SettingsCardHeaderIconMaxSize">24</sys:Double>
+                <c:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
                 <Style x:Key="SettingsSectionHeaderTextBlockStyle"
                     BasedOn="{StaticResource BodyStrongTextBlockStyle}"
                     TargetType="TextBlock">
@@ -285,72 +287,134 @@
                             Icon="{x:Static ui:SegoeFluentIcons.Save}"
                             Toggled="ToggleSwitchSaveFullPageStrokes_Toggled"/>
 
-                    <TextBlock Text="悬浮窗拦截" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}"/>
-
-                    <controls:LabeledSettingsCard x:Name="CardFloatingWindowInterceptorEnabled"
+                    <ui:SettingsExpander x:Name="ExpanderFloatingWindowInterceptor"
                             Header="启用悬浮窗拦截"
-                            Icon="{x:Static ui:SegoeFluentIcons.Shield}"
-                            Toggled="ToggleSwitchFloatingWindowInterceptorEnabled_Toggled"/>
-
-                    <ui:SettingsExpander Header="拦截规则"
-                            Visibility="{Binding IsOn, ElementName=CardFloatingWindowInterceptorEnabled, Converter={StaticResource BooleanToVisibilityConverter}}"
-                            IsExpanded="{Binding IsOn, ElementName=CardFloatingWindowInterceptorEnabled, Mode=OneWay}">
+                            d:IsExpanded="True">
                         <ui:SettingsExpander.HeaderIcon>
-                            <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Filter}"/>
+                            <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Shield}"/>
                         </ui:SettingsExpander.HeaderIcon>
+                        <ui:ToggleSwitch x:Name="ToggleSwitchFloatingWindowInterceptorEnabled"
+                                OnContent="{DynamicResource Common_On}"
+                                OffContent="{DynamicResource Common_Off}"
+                                Toggled="ToggleSwitchFloatingWindowInterceptorEnabled_Toggled"/>
                         <ui:SettingsExpander.Items>
-                            <controls:LabeledSettingsCard x:Name="CardSeewoWhiteboard3Floating"
-                                Header="{i18n:I18n Key=FloatingInterceptor_App_SeewoBoard3}"
-                                IconSource="/Resources/Icons-png/EasiNote3.png"
-                                Toggled="ToggleSwitchSeewoWhiteboard3Floating_Toggled"/>
-                            <controls:LabeledSettingsCard x:Name="CardSeewoWhiteboard5Floating"
-                                Header="{i18n:I18n Key=FloatingInterceptor_App_SeewoBoard5}"
-                                IconSource="/Resources/Icons-png/EasiNote.png"
-                                Toggled="ToggleSwitchSeewoWhiteboard5Floating_Toggled"/>
-                            <controls:LabeledSettingsCard x:Name="CardSeewoWhiteboard5CFloating"
-                                Header="{i18n:I18n Key=FloatingInterceptor_App_SeewoBoard5C}"
-                                IconSource="/Resources/Icons-png/EasiNote5C.png"
-                                Toggled="ToggleSwitchSeewoWhiteboard5CFloating_Toggled"/>
-                            <controls:LabeledSettingsCard x:Name="CardSeewoPincoSideBarFloating"
-                                Header="{i18n:I18n Key=FloatingInterceptor_App_SeewoPinco}"
-                                IconSource="/Resources/Icons-png/SeewoPinco.png"
-                                Toggled="ToggleSwitchSeewoPincoSideBarFloating_Toggled"/>
-                            <controls:LabeledSettingsCard x:Name="CardSeewoPincoDrawingFloating"
-                                Header="{i18n:I18n Key=FloatingInterceptor_App_SeewoPincoDrawing}"
-                                IconSource="/Resources/Icons-png/SeewoPinco.png"
-                                Toggled="ToggleSwitchSeewoPincoDrawingFloating_Toggled"/>
-                            <controls:LabeledSettingsCard x:Name="CardSeewoPPTFloating"
-                                Header="{i18n:I18n Key=FloatingInterceptor_App_SeewoPPTTools}"
-                                IconSource="/Resources/Icons-png/PPTTools.png"
-                                Toggled="ToggleSwitchSeewoPPTFloating_Toggled"/>
-                            <controls:LabeledSettingsCard x:Name="CardAiClassFloating"
-                                Header="{i18n:I18n Key=FloatingInterceptor_App_AiClass}"
-                                IconSource="/Resources/Icons-png/AiClass.png"
-                                Toggled="ToggleSwitchAiClassFloating_Toggled"/>
-                            <controls:LabeledSettingsCard x:Name="CardHiteAnnotationFloating"
-                                Header="{i18n:I18n Key=FloatingInterceptor_App_HiteAnnotation}"
-                                IconSource="/Resources/Icons-png/HiteAnnotation.png"
-                                Toggled="ToggleSwitchHiteAnnotationFloating_Toggled"/>
-                            <controls:LabeledSettingsCard x:Name="CardChangYanFloating"
-                                Header="{i18n:I18n Key=FloatingInterceptor_App_ChangYanClass}"
-                                IconSource="/Resources/Icons-png/畅言智慧课堂.png"
-                                Toggled="ToggleSwitchChangYanFloating_Toggled"/>
-                            <controls:LabeledSettingsCard x:Name="CardChangYanPptFloating"
-                                Header="{i18n:I18n Key=FloatingInterceptor_App_ChangYanPPT}"
-                                IconSource="/Resources/Icons-png/畅言智慧课堂.png"
-                                Toggled="ToggleSwitchChangYanPptFloating_Toggled"/>
-                            <controls:LabeledSettingsCard x:Name="CardIntelligentClassFloating"
-                                Header="{i18n:I18n Key=FloatingInterceptor_App_IntelligentClass}"
-                                IconSource="/Resources/Icons-png/天喻教育云.png"
-                                Toggled="ToggleSwitchIntelligentClassFloating_Toggled"/>
-                            <controls:LabeledSettingsCard x:Name="CardSeewoDesktopAnnotationFloating"
-                                Header="{i18n:I18n Key=FloatingInterceptor_App_SeewoDesktopAnnotation}"
-                                IconSource="/Resources/Icons-png/Seewo2Annotation.png"
-                                Toggled="ToggleSwitchSeewoDesktopAnnotationFloating_Toggled"/>
-                            <controls:LabeledSettingsCard x:Name="CardSeewoDesktopSideBarFloating"
-                                Header="{i18n:I18n Key=FloatingInterceptor_App_SeewoDesktopSideBar}"
-                                IconSource="/Resources/Icons-png/Seewo2Annotation.png"
-                                Toggled="ToggleSwitchSeewoDesktopSideBarFloating_Toggled"/>
+                            <ui:SettingsCard Header="{i18n:I18n Key=FloatingInterceptor_App_SeewoBoard3}">
+                                <ui:SettingsCard.HeaderIcon>
+                                    <ui:ImageIcon Source="/Resources/Icons-png/EasiNote3.png"/>
+                                </ui:SettingsCard.HeaderIcon>
+                                <ui:ToggleSwitch x:Name="ToggleSwitchSeewoWhiteboard3Floating"
+                                        OnContent="{DynamicResource Common_On}"
+                                        OffContent="{DynamicResource Common_Off}"
+                                        Toggled="ToggleSwitchSeewoWhiteboard3Floating_Toggled"/>
+                            </ui:SettingsCard>
+                            <ui:SettingsCard Header="{i18n:I18n Key=FloatingInterceptor_App_SeewoBoard5}">
+                                <ui:SettingsCard.HeaderIcon>
+                                    <ui:ImageIcon Source="/Resources/Icons-png/EasiNote.png"/>
+                                </ui:SettingsCard.HeaderIcon>
+                                <ui:ToggleSwitch x:Name="ToggleSwitchSeewoWhiteboard5Floating"
+                                        OnContent="{DynamicResource Common_On}"
+                                        OffContent="{DynamicResource Common_Off}"
+                                        Toggled="ToggleSwitchSeewoWhiteboard5Floating_Toggled"/>
+                            </ui:SettingsCard>
+                            <ui:SettingsCard Header="{i18n:I18n Key=FloatingInterceptor_App_SeewoBoard5C}">
+                                <ui:SettingsCard.HeaderIcon>
+                                    <ui:ImageIcon Source="/Resources/Icons-png/EasiNote5C.png"/>
+                                </ui:SettingsCard.HeaderIcon>
+                                <ui:ToggleSwitch x:Name="ToggleSwitchSeewoWhiteboard5CFloating"
+                                        OnContent="{DynamicResource Common_On}"
+                                        OffContent="{DynamicResource Common_Off}"
+                                        Toggled="ToggleSwitchSeewoWhiteboard5CFloating_Toggled"/>
+                            </ui:SettingsCard>
+                            <ui:SettingsCard Header="{i18n:I18n Key=FloatingInterceptor_App_SeewoPinco}">
+                                <ui:SettingsCard.HeaderIcon>
+                                    <ui:ImageIcon Source="/Resources/Icons-png/SeewoPinco.png"/>
+                                </ui:SettingsCard.HeaderIcon>
+                                <ui:ToggleSwitch x:Name="ToggleSwitchSeewoPincoSideBarFloating"
+                                        OnContent="{DynamicResource Common_On}"
+                                        OffContent="{DynamicResource Common_Off}"
+                                        Toggled="ToggleSwitchSeewoPincoSideBarFloating_Toggled"/>
+                            </ui:SettingsCard>
+                            <ui:SettingsCard Header="{i18n:I18n Key=FloatingInterceptor_App_SeewoPincoDrawing}">
+                                <ui:SettingsCard.HeaderIcon>
+                                    <ui:ImageIcon Source="/Resources/Icons-png/SeewoPinco.png"/>
+                                </ui:SettingsCard.HeaderIcon>
+                                <ui:ToggleSwitch x:Name="ToggleSwitchSeewoPincoDrawingFloating"
+                                        OnContent="{DynamicResource Common_On}"
+                                        OffContent="{DynamicResource Common_Off}"
+                                        Toggled="ToggleSwitchSeewoPincoDrawingFloating_Toggled"/>
+                            </ui:SettingsCard>
+                            <ui:SettingsCard Header="{i18n:I18n Key=FloatingInterceptor_App_SeewoPPTTools}">
+                                <ui:SettingsCard.HeaderIcon>
+                                    <ui:ImageIcon Source="/Resources/Icons-png/PPTTools.png"/>
+                                </ui:SettingsCard.HeaderIcon>
+                                <ui:ToggleSwitch x:Name="ToggleSwitchSeewoPPTFloating"
+                                        OnContent="{DynamicResource Common_On}"
+                                        OffContent="{DynamicResource Common_Off}"
+                                        Toggled="ToggleSwitchSeewoPPTFloating_Toggled"/>
+                            </ui:SettingsCard>
+                            <ui:SettingsCard Header="{i18n:I18n Key=FloatingInterceptor_App_AiClass}">
+                                <ui:SettingsCard.HeaderIcon>
+                                    <ui:ImageIcon Source="/Resources/Icons-png/AiClass.png"/>
+                                </ui:SettingsCard.HeaderIcon>
+                                <ui:ToggleSwitch x:Name="ToggleSwitchAiClassFloating"
+                                        OnContent="{DynamicResource Common_On}"
+                                        OffContent="{DynamicResource Common_Off}"
+                                        Toggled="ToggleSwitchAiClassFloating_Toggled"/>
+                            </ui:SettingsCard>
+                            <ui:SettingsCard Header="{i18n:I18n Key=FloatingInterceptor_App_HiteAnnotation}">
+                                <ui:SettingsCard.HeaderIcon>
+                                    <ui:ImageIcon Source="/Resources/Icons-png/HiteAnnotation.png"/>
+                                </ui:SettingsCard.HeaderIcon>
+                                <ui:ToggleSwitch x:Name="ToggleSwitchHiteAnnotationFloating"
+                                        OnContent="{DynamicResource Common_On}"
+                                        OffContent="{DynamicResource Common_Off}"
+                                        Toggled="ToggleSwitchHiteAnnotationFloating_Toggled"/>
+                            </ui:SettingsCard>
+                            <ui:SettingsCard Header="{i18n:I18n Key=FloatingInterceptor_App_ChangYanClass}">
+                                <ui:SettingsCard.HeaderIcon>
+                                    <ui:ImageIcon Source="/Resources/Icons-png/畅言智慧课堂.png"/>
+                                </ui:SettingsCard.HeaderIcon>
+                                <ui:ToggleSwitch x:Name="ToggleSwitchChangYanFloating"
+                                        OnContent="{DynamicResource Common_On}"
+                                        OffContent="{DynamicResource Common_Off}"
+                                        Toggled="ToggleSwitchChangYanFloating_Toggled"/>
+                            </ui:SettingsCard>
+                            <ui:SettingsCard Header="{i18n:I18n Key=FloatingInterceptor_App_ChangYanPPT}">
+                                <ui:SettingsCard.HeaderIcon>
+                                    <ui:ImageIcon Source="/Resources/Icons-png/畅言智慧课堂.png"/>
+                                </ui:SettingsCard.HeaderIcon>
+                                <ui:ToggleSwitch x:Name="ToggleSwitchChangYanPptFloating"
+                                        OnContent="{DynamicResource Common_On}"
+                                        OffContent="{DynamicResource Common_Off}"
+                                        Toggled="ToggleSwitchChangYanPptFloating_Toggled"/>
+                            </ui:SettingsCard>
+                            <ui:SettingsCard Header="{i18n:I18n Key=FloatingInterceptor_App_IntelligentClass}">
+                                <ui:SettingsCard.HeaderIcon>
+                                    <ui:ImageIcon Source="/Resources/Icons-png/天喻教育云.png"/>
+                                </ui:SettingsCard.HeaderIcon>
+                                <ui:ToggleSwitch x:Name="ToggleSwitchIntelligentClassFloating"
+                                        OnContent="{DynamicResource Common_On}"
+                                        OffContent="{DynamicResource Common_Off}"
+                                        Toggled="ToggleSwitchIntelligentClassFloating_Toggled"/>
+                            </ui:SettingsCard>
+                            <ui:SettingsCard Header="{i18n:I18n Key=FloatingInterceptor_App_SeewoDesktopAnnotation}">
+                                <ui:SettingsCard.HeaderIcon>
+                                    <ui:ImageIcon Source="/Resources/Icons-png/Seewo2Annotation.png"/>
+                                </ui:SettingsCard.HeaderIcon>
+                                <ui:ToggleSwitch x:Name="ToggleSwitchSeewoDesktopAnnotationFloating"
+                                        OnContent="{DynamicResource Common_On}"
+                                        OffContent="{DynamicResource Common_Off}"
+                                        Toggled="ToggleSwitchSeewoDesktopAnnotationFloating_Toggled"/>
+                            </ui:SettingsCard>
+                            <ui:SettingsCard Header="{i18n:I18n Key=FloatingInterceptor_App_SeewoDesktopSideBar}">
+                                <ui:SettingsCard.HeaderIcon>
+                                    <ui:ImageIcon Source="/Resources/Icons-png/Seewo2Annotation.png"/>
+                                </ui:SettingsCard.HeaderIcon>
+                                <ui:ToggleSwitch x:Name="ToggleSwitchSeewoDesktopSideBarFloating"
+                                        OnContent="{DynamicResource Common_On}"
+                                        OffContent="{DynamicResource Common_Off}"
+                                        Toggled="ToggleSwitchSeewoDesktopSideBarFloating_Toggled"/>
+                            </ui:SettingsCard>
                         </ui:SettingsExpander.Items>
                     </ui:SettingsExpander>
 
diff --git a/Ink Canvas/Windows/SettingsViews/Pages/AutomationPage.xaml.cs b/Ink Canvas/Windows/SettingsViews/Pages/AutomationPage.xaml.cs
index 59dbca7f..06b96774 100644
--- a/Ink Canvas/Windows/SettingsViews/Pages/AutomationPage.xaml.cs	
+++ b/Ink Canvas/Windows/SettingsViews/Pages/AutomationPage.xaml.cs	
@@ -96,22 +96,23 @@ namespace Ink_Canvas.Windows.SettingsViews.Pages
             SideControlMinimumAutomationSlider.Value = auto.MinimumAutomationStrokeNumber;
             CardSaveFullPageStrokes.IsOn = auto.IsSaveFullPageStrokes;
 
-            CardFloatingWindowInterceptorEnabled.IsOn = auto.FloatingWindowInterceptor.IsEnabled;
+            ToggleSwitchFloatingWindowInterceptorEnabled.IsOn = auto.FloatingWindowInterceptor.IsEnabled;
+            ExpanderFloatingWindowInterceptor.IsExpanded = auto.FloatingWindowInterceptor.IsEnabled;
             if (auto.FloatingWindowInterceptor.InterceptRules != null)
             {
-                CardSeewoWhiteboard3Floating.IsOn = auto.FloatingWindowInterceptor.InterceptRules.ContainsKey("SeewoWhiteboard3Floating") && auto.FloatingWindowInterceptor.InterceptRules["SeewoWhiteboard3Floating"];
-                CardSeewoWhiteboard5Floating.IsOn = auto.FloatingWindowInterceptor.InterceptRules.ContainsKey("SeewoWhiteboard5Floating") && auto.FloatingWindowInterceptor.InterceptRules["SeewoWhiteboard5Floating"];
-                CardSeewoWhiteboard5CFloating.IsOn = auto.FloatingWindowInterceptor.InterceptRules.ContainsKey("SeewoWhiteboard5CFloating") && auto.FloatingWindowInterceptor.InterceptRules["SeewoWhiteboard5CFloating"];
-                CardSeewoPincoSideBarFloating.IsOn = auto.FloatingWindowInterceptor.InterceptRules.ContainsKey("SeewoPincoSideBarFloating") && auto.FloatingWindowInterceptor.InterceptRules["SeewoPincoSideBarFloating"];
-                CardSeewoPincoDrawingFloating.IsOn = auto.FloatingWindowInterceptor.InterceptRules.ContainsKey("SeewoPincoDrawingFloating") && auto.FloatingWindowInterceptor.InterceptRules["SeewoPincoDrawingFloating"];
-                CardSeewoPPTFloating.IsOn = auto.FloatingWindowInterceptor.InterceptRules.ContainsKey("SeewoPPTFloating") && auto.FloatingWindowInterceptor.InterceptRules["SeewoPPTFloating"];
-                CardAiClassFloating.IsOn = auto.FloatingWindowInterceptor.InterceptRules.ContainsKey("AiClassFloating") && auto.FloatingWindowInterceptor.InterceptRules["AiClassFloating"];
-                CardHiteAnnotationFloating.IsOn = auto.FloatingWindowInterceptor.InterceptRules.ContainsKey("HiteAnnotationFloating") && auto.FloatingWindowInterceptor.InterceptRules["HiteAnnotationFloating"];
-                CardChangYanFloating.IsOn = auto.FloatingWindowInterceptor.InterceptRules.ContainsKey("ChangYanFloating") && auto.FloatingWindowInterceptor.InterceptRules["ChangYanFloating"];
-                CardChangYanPptFloating.IsOn = auto.FloatingWindowInterceptor.InterceptRules.ContainsKey("ChangYanPptFloating") && auto.FloatingWindowInterceptor.InterceptRules["ChangYanPptFloating"];
-                CardIntelligentClassFloating.IsOn = auto.FloatingWindowInterceptor.InterceptRules.ContainsKey("IntelligentClassFloating") && auto.FloatingWindowInterceptor.InterceptRules["IntelligentClassFloating"];
-                CardSeewoDesktopAnnotationFloating.IsOn = auto.FloatingWindowInterceptor.InterceptRules.ContainsKey("SeewoDesktopAnnotationFloating") && auto.FloatingWindowInterceptor.InterceptRules["SeewoDesktopAnnotationFloating"];
-                CardSeewoDesktopSideBarFloating.IsOn = auto.FloatingWindowInterceptor.InterceptRules.ContainsKey("SeewoDesktopSideBarFloating") && auto.FloatingWindowInterceptor.InterceptRules["SeewoDesktopSideBarFloating"];
+                ToggleSwitchSeewoWhiteboard3Floating.IsOn = auto.FloatingWindowInterceptor.InterceptRules.ContainsKey("SeewoWhiteboard3Floating") && auto.FloatingWindowInterceptor.InterceptRules["SeewoWhiteboard3Floating"];
+                ToggleSwitchSeewoWhiteboard5Floating.IsOn = auto.FloatingWindowInterceptor.InterceptRules.ContainsKey("SeewoWhiteboard5Floating") && auto.FloatingWindowInterceptor.InterceptRules["SeewoWhiteboard5Floating"];
+                ToggleSwitchSeewoWhiteboard5CFloating.IsOn = auto.FloatingWindowInterceptor.InterceptRules.ContainsKey("SeewoWhiteboard5CFloating") && auto.FloatingWindowInterceptor.InterceptRules["SeewoWhiteboard5CFloating"];
+                ToggleSwitchSeewoPincoSideBarFloating.IsOn = auto.FloatingWindowInterceptor.InterceptRules.ContainsKey("SeewoPincoSideBarFloating") && auto.FloatingWindowInterceptor.InterceptRules["SeewoPincoSideBarFloating"];
+                ToggleSwitchSeewoPincoDrawingFloating.IsOn = auto.FloatingWindowInterceptor.InterceptRules.ContainsKey("SeewoPincoDrawingFloating") && auto.FloatingWindowInterceptor.InterceptRules["SeewoPincoDrawingFloating"];
+                ToggleSwitchSeewoPPTFloating.IsOn = auto.FloatingWindowInterceptor.InterceptRules.ContainsKey("SeewoPPTFloating") && auto.FloatingWindowInterceptor.InterceptRules["SeewoPPTFloating"];
+                ToggleSwitchAiClassFloating.IsOn = auto.FloatingWindowInterceptor.InterceptRules.ContainsKey("AiClassFloating") && auto.FloatingWindowInterceptor.InterceptRules["AiClassFloating"];
+                ToggleSwitchHiteAnnotationFloating.IsOn = auto.FloatingWindowInterceptor.InterceptRules.ContainsKey("HiteAnnotationFloating") && auto.FloatingWindowInterceptor.InterceptRules["HiteAnnotationFloating"];
+                ToggleSwitchChangYanFloating.IsOn = auto.FloatingWindowInterceptor.InterceptRules.ContainsKey("ChangYanFloating") && auto.FloatingWindowInterceptor.InterceptRules["ChangYanFloating"];
+                ToggleSwitchChangYanPptFloating.IsOn = auto.FloatingWindowInterceptor.InterceptRules.ContainsKey("ChangYanPptFloating") && auto.FloatingWindowInterceptor.InterceptRules["ChangYanPptFloating"];
+                ToggleSwitchIntelligentClassFloating.IsOn = auto.FloatingWindowInterceptor.InterceptRules.ContainsKey("IntelligentClassFloating") && auto.FloatingWindowInterceptor.InterceptRules["IntelligentClassFloating"];
+                ToggleSwitchSeewoDesktopAnnotationFloating.IsOn = auto.FloatingWindowInterceptor.InterceptRules.ContainsKey("SeewoDesktopAnnotationFloating") && auto.FloatingWindowInterceptor.InterceptRules["SeewoDesktopAnnotationFloating"];
+                ToggleSwitchSeewoDesktopSideBarFloating.IsOn = auto.FloatingWindowInterceptor.InterceptRules.ContainsKey("SeewoDesktopSideBarFloating") && auto.FloatingWindowInterceptor.InterceptRules["SeewoDesktopSideBarFloating"];
             }
 
             _isLoaded = true;
@@ -480,7 +481,8 @@ namespace Ink_Canvas.Windows.SettingsViews.Pages
             if (!_isLoaded) return;
             var mw = GetMainWindow();
             if (mw == null) return;
-            SettingsManager.Settings.Automation.FloatingWindowInterceptor.IsEnabled = CardFloatingWindowInterceptorEnabled.IsOn;
+            SettingsManager.Settings.Automation.FloatingWindowInterceptor.IsEnabled = ToggleSwitchFloatingWindowInterceptorEnabled.IsOn;
+            ExpanderFloatingWindowInterceptor.IsExpanded = ToggleSwitchFloatingWindowInterceptorEnabled.IsOn;
             if (mw._floatingWindowInterceptorManager != null)
             {
                 if (SettingsManager.Settings.Automation.FloatingWindowInterceptor.IsEnabled)
@@ -494,79 +496,79 @@ namespace Ink_Canvas.Windows.SettingsViews.Pages
         private void ToggleSwitchSeewoWhiteboard3Floating_Toggled(object sender, RoutedEventArgs e)
         {
             if (!_isLoaded) return;
-            GetMainWindow()?.SetInterceptRule(FloatingWindowInterceptor.InterceptType.SeewoWhiteboard3Floating, CardSeewoWhiteboard3Floating.IsOn);
+            GetMainWindow()?.SetInterceptRule(FloatingWindowInterceptor.InterceptType.SeewoWhiteboard3Floating, ToggleSwitchSeewoWhiteboard3Floating.IsOn);
         }
 
         private void ToggleSwitchSeewoWhiteboard5Floating_Toggled(object sender, RoutedEventArgs e)
         {
             if (!_isLoaded) return;
-            GetMainWindow()?.SetInterceptRule(FloatingWindowInterceptor.InterceptType.SeewoWhiteboard5Floating, CardSeewoWhiteboard5Floating.IsOn);
+            GetMainWindow()?.SetInterceptRule(FloatingWindowInterceptor.InterceptType.SeewoWhiteboard5Floating, ToggleSwitchSeewoWhiteboard5Floating.IsOn);
         }
 
         private void ToggleSwitchSeewoWhiteboard5CFloating_Toggled(object sender, RoutedEventArgs e)
         {
             if (!_isLoaded) return;
-            GetMainWindow()?.SetInterceptRule(FloatingWindowInterceptor.InterceptType.SeewoWhiteboard5CFloating, CardSeewoWhiteboard5CFloating.IsOn);
+            GetMainWindow()?.SetInterceptRule(FloatingWindowInterceptor.InterceptType.SeewoWhiteboard5CFloating, ToggleSwitchSeewoWhiteboard5CFloating.IsOn);
         }
 
         private void ToggleSwitchSeewoPincoSideBarFloating_Toggled(object sender, RoutedEventArgs e)
         {
             if (!_isLoaded) return;
-            GetMainWindow()?.SetInterceptRule(FloatingWindowInterceptor.InterceptType.SeewoPincoSideBarFloating, CardSeewoPincoSideBarFloating.IsOn);
+            GetMainWindow()?.SetInterceptRule(FloatingWindowInterceptor.InterceptType.SeewoPincoSideBarFloating, ToggleSwitchSeewoPincoSideBarFloating.IsOn);
         }
 
         private void ToggleSwitchSeewoPincoDrawingFloating_Toggled(object sender, RoutedEventArgs e)
         {
             if (!_isLoaded) return;
-            GetMainWindow()?.SetInterceptRule(FloatingWindowInterceptor.InterceptType.SeewoPincoDrawingFloating, CardSeewoPincoDrawingFloating.IsOn);
+            GetMainWindow()?.SetInterceptRule(FloatingWindowInterceptor.InterceptType.SeewoPincoDrawingFloating, ToggleSwitchSeewoPincoDrawingFloating.IsOn);
         }
 
         private void ToggleSwitchSeewoPPTFloating_Toggled(object sender, RoutedEventArgs e)
         {
             if (!_isLoaded) return;
-            GetMainWindow()?.SetInterceptRule(FloatingWindowInterceptor.InterceptType.SeewoPPTFloating, CardSeewoPPTFloating.IsOn);
+            GetMainWindow()?.SetInterceptRule(FloatingWindowInterceptor.InterceptType.SeewoPPTFloating, ToggleSwitchSeewoPPTFloating.IsOn);
         }
 
         private void ToggleSwitchAiClassFloating_Toggled(object sender, RoutedEventArgs e)
         {
             if (!_isLoaded) return;
-            GetMainWindow()?.SetInterceptRule(FloatingWindowInterceptor.InterceptType.AiClassFloating, CardAiClassFloating.IsOn);
+            GetMainWindow()?.SetInterceptRule(FloatingWindowInterceptor.InterceptType.AiClassFloating, ToggleSwitchAiClassFloating.IsOn);
         }
 
         private void ToggleSwitchHiteAnnotationFloating_Toggled(object sender, RoutedEventArgs e)
         {
             if (!_isLoaded) return;
-            GetMainWindow()?.SetInterceptRule(FloatingWindowInterceptor.InterceptType.HiteAnnotationFloating, CardHiteAnnotationFloating.IsOn);
+            GetMainWindow()?.SetInterceptRule(FloatingWindowInterceptor.InterceptType.HiteAnnotationFloating, ToggleSwitchHiteAnnotationFloating.IsOn);
         }
 
         private void ToggleSwitchChangYanFloating_Toggled(object sender, RoutedEventArgs e)
         {
             if (!_isLoaded) return;
-            GetMainWindow()?.SetInterceptRule(FloatingWindowInterceptor.InterceptType.ChangYanFloating, CardChangYanFloating.IsOn);
+            GetMainWindow()?.SetInterceptRule(FloatingWindowInterceptor.InterceptType.ChangYanFloating, ToggleSwitchChangYanFloating.IsOn);
         }
 
         private void ToggleSwitchChangYanPptFloating_Toggled(object sender, RoutedEventArgs e)
         {
             if (!_isLoaded) return;
-            GetMainWindow()?.SetInterceptRule(FloatingWindowInterceptor.InterceptType.ChangYanPptFloating, CardChangYanPptFloating.IsOn);
+            GetMainWindow()?.SetInterceptRule(FloatingWindowInterceptor.InterceptType.ChangYanPptFloating, ToggleSwitchChangYanPptFloating.IsOn);
         }
 
         private void ToggleSwitchIntelligentClassFloating_Toggled(object sender, RoutedEventArgs e)
         {
             if (!_isLoaded) return;
-            GetMainWindow()?.SetInterceptRule(FloatingWindowInterceptor.InterceptType.IntelligentClassFloating, CardIntelligentClassFloating.IsOn);
+            GetMainWindow()?.SetInterceptRule(FloatingWindowInterceptor.InterceptType.IntelligentClassFloating, ToggleSwitchIntelligentClassFloating.IsOn);
         }
 
         private void ToggleSwitchSeewoDesktopAnnotationFloating_Toggled(object sender, RoutedEventArgs e)
         {
             if (!_isLoaded) return;
-            GetMainWindow()?.SetInterceptRule(FloatingWindowInterceptor.InterceptType.SeewoDesktopAnnotationFloating, CardSeewoDesktopAnnotationFloating.IsOn);
+            GetMainWindow()?.SetInterceptRule(FloatingWindowInterceptor.InterceptType.SeewoDesktopAnnotationFloating, ToggleSwitchSeewoDesktopAnnotationFloating.IsOn);
         }
 
         private void ToggleSwitchSeewoDesktopSideBarFloating_Toggled(object sender, RoutedEventArgs e)
         {
             if (!_isLoaded) return;
-            GetMainWindow()?.SetInterceptRule(FloatingWindowInterceptor.InterceptType.SeewoDesktopSideBarFloating, CardSeewoDesktopSideBarFloating.IsOn);
+            GetMainWindow()?.SetInterceptRule(FloatingWindowInterceptor.InterceptType.SeewoDesktopSideBarFloating, ToggleSwitchSeewoDesktopSideBarFloating.IsOn);
         }
 
         #endregion
diff --git a/Ink Canvas/Windows/SettingsViews/Pages/PowerPointPage.xaml b/Ink Canvas/Windows/SettingsViews/Pages/PowerPointPage.xaml
index fa985f08..a1574fbe 100644
--- a/Ink Canvas/Windows/SettingsViews/Pages/PowerPointPage.xaml	
+++ b/Ink Canvas/Windows/SettingsViews/Pages/PowerPointPage.xaml	
@@ -8,6 +8,7 @@
       xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
       xmlns:i18n="clr-namespace:Ink_Canvas.MarkupExtensions"
       xmlns:controls="clr-namespace:Ink_Canvas.Controls;assembly=InkCanvas.Controls"
+      xmlns:c="clr-namespace:Ink_Canvas.Converter"
       xmlns:sys="clr-namespace:System;assembly=mscorlib"
       mc:Ignorable="d"
       Title="{i18n:I18n Key=Nav_PPT_Settings}">
@@ -16,6 +17,7 @@
         <Grid Margin="59,0,59,0">
             <FrameworkElement.Resources>
                 <sys:Double x:Key="SettingsCardSpacing">4</sys:Double>
+                <c:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
                 <Style x:Key="SettingsSectionHeaderTextBlockStyle"
                     BasedOn="{StaticResource BodyStrongTextBlockStyle}"
                     TargetType="TextBlock">