CJKmkp/community
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(UI): 使用 LabeledSettingsCard 替换 SettingsCard 和 ToggleSwitch 组合

Browse Source 
统一设置页面中的开关控件样式，将原有的 SettingsCard 和 ToggleSwitch 组合替换为自定义的 LabeledSettingsCard 控件，简化 XAML 结构并保持功能不变
This commit is contained in:
PrefacedCorg
2026-04-25 20:54:26 +08:00
parent f3ef2f7aec
commit 24cbaf69ea
2 changed files with 91 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ink Canvas/Windows/SettingsViews/Pages/AdvancedPage.xaml
+45 -84
View File
@@ -32,28 +32,18 @@
<TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}"
Text="{i18n:I18n Key=Advanced_Title}" /> Text="{i18n:I18n Key=Advanced_Title}" />
<ui:SettingsCard Header="{i18n:I18n Key=Advanced_SpecialScreenMode}"> <controls:LabeledSettingsCard x:Name="ToggleSwitchIsSpecialScreen"
<ui:SettingsCard.HeaderIcon> Header="{i18n:I18n Key=Advanced_SpecialScreenMode}"
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Settings}" /> Icon="{x:Static ui:SegoeFluentIcons.Settings}"
</ui:SettingsCard.HeaderIcon> IsOn="True"
<ui:ToggleSwitch x:Name="ToggleSwitchIsSpecialScreen" Toggled="ToggleSwitchIsSpecialScreen_OnToggled"/>
OnContent="{DynamicResource Common_On}"
OffContent="{DynamicResource Common_Off}"
IsOn="True"
Toggled="ToggleSwitchIsSpecialScreen_OnToggled"/>
</ui:SettingsCard>
<ui:SettingsCard Header="{i18n:I18n Key=Canvas_DisableHardwareAcceleration}" <controls:LabeledSettingsCard x:Name="ToggleSwitchDisableHardwareAcceleration"
Description="{i18n:I18n Key=Canvas_DisableHardwareAccelerationHint}"> Header="{i18n:I18n Key=Canvas_DisableHardwareAcceleration}"
<ui:SettingsCard.HeaderIcon> Description="{i18n:I18n Key=Canvas_DisableHardwareAccelerationHint}"
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Process}" /> Icon="{x:Static ui:SegoeFluentIcons.Settings}"
</ui:SettingsCard.HeaderIcon> IsOn="False"
<ui:ToggleSwitch x:Name="ToggleSwitchDisableHardwareAcceleration" Toggled="ToggleSwitchDisableHardwareAcceleration_Toggled"/>
OnContent="{DynamicResource Common_On}"
OffContent="{DynamicResource Common_Off}"
IsOn="False"
Toggled="ToggleSwitchDisableHardwareAcceleration_Toggled"/>
</ui:SettingsCard>
<ui:SettingsExpander x:Name="CardTouchMultiplier" <ui:SettingsExpander x:Name="CardTouchMultiplier"
Header="{i18n:I18n Key=Advanced_TouchMultiplier}" Header="{i18n:I18n Key=Advanced_TouchMultiplier}"
@@ -83,17 +73,12 @@
</ui:SettingsExpander.Items> </ui:SettingsExpander.Items>
</ui:SettingsExpander> </ui:SettingsExpander>
<ui:SettingsCard Header="{i18n:I18n Key=Advanced_EraserBindTouchMultiplier}" <controls:LabeledSettingsCard x:Name="ToggleSwitchEraserBindTouchMultiplier"
Description="{i18n:I18n Key=Advanced_EraserBindTouchHint}"> Header="{i18n:I18n Key=Advanced_EraserBindTouchMultiplier}"
<ui:SettingsCard.HeaderIcon> Description="{i18n:I18n Key=Advanced_EraserBindTouchHint}"
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.EraseTool}" /> Icon="{x:Static ui:SegoeFluentIcons.EraseTool}"
</ui:SettingsCard.HeaderIcon> IsOn="True"
<ui:ToggleSwitch x:Name="ToggleSwitchEraserBindTouchMultiplier" Toggled="ToggleSwitchEraserBindTouchMultiplier_Toggled"/>
OnContent="{DynamicResource Common_On}"
OffContent="{DynamicResource Common_Off}"
IsOn="True"
Toggled="ToggleSwitchEraserBindTouchMultiplier_Toggled"/>
</ui:SettingsCard>
<ui:SettingsCard Header="{i18n:I18n Key=Advanced_NibModeBoundsWidthHeader}"> <ui:SettingsCard Header="{i18n:I18n Key=Advanced_NibModeBoundsWidthHeader}">
<Slider x:Name="NibModeBoundsWidthSlider" <Slider x:Name="NibModeBoundsWidthSlider"
@@ -111,50 +96,32 @@
ValueChanged="FingerModeBoundsWidthSlider_ValueChanged" /> ValueChanged="FingerModeBoundsWidthSlider_ValueChanged" />
</ui:SettingsCard> </ui:SettingsCard>
<ui:SettingsCard Header="{i18n:I18n Key=Advanced_QuadIRMode}"> <controls:LabeledSettingsCard x:Name="ToggleSwitchIsQuadIR"
<ui:SettingsCard.HeaderIcon> Header="{i18n:I18n Key=Advanced_QuadIRMode}"
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.FullScreen}" /> Icon="{x:Static ui:SegoeFluentIcons.FullScreen}"
</ui:SettingsCard.HeaderIcon> IsOn="True"
<ui:ToggleSwitch x:Name="ToggleSwitchIsQuadIR" Toggled="ToggleSwitchIsQuadIR_Toggled"/>
OnContent="{DynamicResource Common_On}"
OffContent="{DynamicResource Common_Off}"
IsOn="True"
Toggled="ToggleSwitchIsQuadIR_Toggled"/>
</ui:SettingsCard>
<TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}"
Text="{i18n:I18n Key=Advanced_Logging}" /> Text="{i18n:I18n Key=Advanced_Logging}" />
<ui:SettingsCard Header="{i18n:I18n Key=Advanced_Logging}"> <controls:LabeledSettingsCard x:Name="ToggleSwitchIsLogEnabled"
<ui:SettingsCard.HeaderIcon> Header="{i18n:I18n Key=Advanced_Logging}"
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.OpenFile}" /> Icon="{x:Static ui:SegoeFluentIcons.OpenFile}"
</ui:SettingsCard.HeaderIcon> IsOn="True"
<ui:ToggleSwitch x:Name="ToggleSwitchIsLogEnabled" Toggled="ToggleSwitchIsLogEnabled_Toggled"/>
OnContent="{DynamicResource Common_On}"
OffContent="{DynamicResource Common_Off}"
IsOn="True"
Toggled="ToggleSwitchIsLogEnabled_Toggled"/>
</ui:SettingsCard>
<ui:SettingsCard Header="{i18n:I18n Key=Advanced_LogByDate}" <controls:LabeledSettingsCard x:Name="ToggleSwitchIsSaveLogByDate"
Description="{i18n:I18n Key=Advanced_LogRotateHint}"> Header="{i18n:I18n Key=Advanced_LogByDate}"
<ui:ToggleSwitch x:Name="ToggleSwitchIsSaveLogByDate" Description="{i18n:I18n Key=Advanced_LogRotateHint}"
OnContent="{DynamicResource Common_On}" IsOn="True"
OffContent="{DynamicResource Common_Off}" Toggled="ToggleSwitchIsSaveLogByDate_Toggled"/>
IsOn="True"
Toggled="ToggleSwitchIsSaveLogByDate_Toggled"/>
</ui:SettingsCard>
<ui:SettingsCard Header="{i18n:I18n Key=Advanced_ConfirmExit}"> <controls:LabeledSettingsCard x:Name="ToggleSwitchIsSecondConfimeWhenShutdownApp"
<ui:SettingsCard.HeaderIcon> Header="{i18n:I18n Key=Advanced_ConfirmExit}"
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.SignOut}" /> Icon="{x:Static ui:SegoeFluentIcons.SignOut}"
</ui:SettingsCard.HeaderIcon> IsOn="True"
<ui:ToggleSwitch x:Name="ToggleSwitchIsSecondConfimeWhenShutdownApp" Toggled="ToggleSwitchIsSecondConfimeWhenShutdownApp_Toggled"/>
OnContent="{DynamicResource Common_On}"
OffContent="{DynamicResource Common_Off}"
IsOn="True"
Toggled="ToggleSwitchIsSecondConfimeWhenShutdownApp_Toggled"/>
</ui:SettingsCard>
<TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}"
Text="{i18n:I18n Key=Backup_Title}" /> Text="{i18n:I18n Key=Backup_Title}" />
@@ -163,21 +130,15 @@
Foreground="{DynamicResource TextFillColorTertiaryBrush}" Foreground="{DynamicResource TextFillColorTertiaryBrush}"
TextWrapping="Wrap" Margin="1,0,0,4" /> TextWrapping="Wrap" Margin="1,0,0,4" />
<ui:SettingsCard Header="{i18n:I18n Key=Backup_AutoBeforeUpdate}"> <controls:LabeledSettingsCard x:Name="ToggleSwitchIsAutoBackupBeforeUpdate"
<ui:ToggleSwitch x:Name="ToggleSwitchIsAutoBackupBeforeUpdate" Header="{i18n:I18n Key=Backup_AutoBeforeUpdate}"
OnContent="{DynamicResource Common_On}" IsOn="True"
OffContent="{DynamicResource Common_Off}" Toggled="ToggleSwitchIsAutoBackupBeforeUpdate_Toggled"/>
IsOn="True"
Toggled="ToggleSwitchIsAutoBackupBeforeUpdate_Toggled"/>
</ui:SettingsCard>
<ui:SettingsCard Header="{i18n:I18n Key=Backup_AutoPeriodic}"> <controls:LabeledSettingsCard x:Name="ToggleSwitchIsAutoBackupEnabled"
<ui:ToggleSwitch x:Name="ToggleSwitchIsAutoBackupEnabled" Header="{i18n:I18n Key=Backup_AutoPeriodic}"
OnContent="{DynamicResource Common_On}" IsOn="True"
OffContent="{DynamicResource Common_Off}" Toggled="ToggleSwitchIsAutoBackupEnabled_Toggled"/>
IsOn="True"
Toggled="ToggleSwitchIsAutoBackupEnabled_Toggled"/>
</ui:SettingsCard>
<ui:SettingsCard Header="{i18n:I18n Key=Backup_Interval}" <ui:SettingsCard Header="{i18n:I18n Key=Backup_Interval}"
Description="{i18n:I18n Key=Backup_Interval_DefaultHint}"> Description="{i18n:I18n Key=Backup_Interval_DefaultHint}">
Ink Canvas/Windows/SettingsViews/Pages/RandomDrawPage.xaml
+46 -58
View File
@@ -8,6 +8,7 @@
xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf" xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
xmlns:i18n="clr-namespace:Ink_Canvas.MarkupExtensions" xmlns:i18n="clr-namespace:Ink_Canvas.MarkupExtensions"
xmlns:sys="clr-namespace:System;assembly=mscorlib" xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:controls="clr-namespace:Ink_Canvas.Controls;assembly=InkCanvas.Controls"
mc:Ignorable="d" mc:Ignorable="d"
Title="{i18n:I18n Key=Random_Title}"> Title="{i18n:I18n Key=Random_Title}">
@@ -31,32 +32,26 @@
<TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}"
Text="{i18n:I18n Key=Random_Title}" /> Text="{i18n:I18n Key=Random_Title}" />
<ui:SettingsCard Header="{i18n:I18n Key=Random_ShowEditNamesButton}"> <controls:LabeledSettingsCard x:Name="ToggleSwitchDisplayRandWindowNamesInputBtn"
<ui:SettingsCard.HeaderIcon> Header="{i18n:I18n Key=Random_ShowEditNamesButton}"
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Edit}" /> Icon="{x:Static ui:SegoeFluentIcons.Edit}"
</ui:SettingsCard.HeaderIcon> IsOn="True"
<ui:ToggleSwitch x:Name="ToggleSwitchDisplayRandWindowNamesInputBtn" Toggled="ToggleSwitchDisplayRandWindowNamesInputBtn_OnToggled"/>
IsOn="True"
Toggled="ToggleSwitchDisplayRandWindowNamesInputBtn_OnToggled"/>
</ui:SettingsCard>
<ui:SettingsCard Header="{i18n:I18n Key=Random_EnableButtons}"> <controls:LabeledSettingsCard x:Name="ToggleSwitchShowRandomAndSingleDraw"
<ui:ToggleSwitch x:Name="ToggleSwitchShowRandomAndSingleDraw" Header="{i18n:I18n Key=Random_EnableButtons}"
IsOn="True" IsOn="True"
Toggled="ToggleSwitchShowRandomAndSingleDraw_Toggled"/> Toggled="ToggleSwitchShowRandomAndSingleDraw_Toggled"/>
</ui:SettingsCard>
<ui:SettingsCard Header="{i18n:I18n Key=Random_EnableQuickButton}"> <controls:LabeledSettingsCard x:Name="ToggleSwitchEnableQuickDraw"
<ui:ToggleSwitch x:Name="ToggleSwitchEnableQuickDraw" Header="{i18n:I18n Key=Random_EnableQuickButton}"
IsOn="True" IsOn="True"
Toggled="ToggleSwitchEnableQuickDraw_Toggled"/> Toggled="ToggleSwitchEnableQuickDraw_Toggled"/>
</ui:SettingsCard>
<ui:SettingsCard Header="{i18n:I18n Key=Random_UseExternal}"> <controls:LabeledSettingsCard x:Name="ToggleSwitchExternalCaller"
<ui:ToggleSwitch x:Name="ToggleSwitchExternalCaller" Header="{i18n:I18n Key=Random_UseExternal}"
IsOn="False" IsOn="False"
Toggled="ToggleSwitchExternalCaller_Toggled"/> Toggled="ToggleSwitchExternalCaller_Toggled"/>
</ui:SettingsCard>
<ui:SettingsCard Header="{i18n:I18n Key=Random_ExternalTypeLabel}"> <ui:SettingsCard Header="{i18n:I18n Key=Random_ExternalTypeLabel}">
<ComboBox x:Name="ComboBoxExternalCallerType" <ComboBox x:Name="ComboBoxExternalCallerType"
@@ -103,17 +98,15 @@
<TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}"
Text="{i18n:I18n Key=Random_NewUI_Title}" /> Text="{i18n:I18n Key=Random_NewUI_Title}" />
<ui:SettingsCard Header="{i18n:I18n Key=Random_NewUI_Enable}"> <controls:LabeledSettingsCard x:Name="ToggleSwitchUseNewRollCallUI"
<ui:ToggleSwitch x:Name="ToggleSwitchUseNewRollCallUI" Header="{i18n:I18n Key=Random_NewUI_Enable}"
IsOn="True" IsOn="True"
Toggled="ToggleSwitchUseNewRollCallUI_Toggled"/> Toggled="ToggleSwitchUseNewRollCallUI_Toggled"/>
</ui:SettingsCard>
<ui:SettingsCard Header="{i18n:I18n Key=Random_ML_AvoidRepeat}"> <controls:LabeledSettingsCard x:Name="ToggleSwitchEnableMLAvoidance"
<ui:ToggleSwitch x:Name="ToggleSwitchEnableMLAvoidance" Header="{i18n:I18n Key=Random_ML_AvoidRepeat}"
IsOn="True" IsOn="True"
Toggled="ToggleSwitchEnableMLAvoidance_Toggled"/> Toggled="ToggleSwitchEnableMLAvoidance_Toggled"/>
</ui:SettingsCard>
<ui:SettingsCard Header="{i18n:I18n Key=Random_ML_HistoryCount}"> <ui:SettingsCard Header="{i18n:I18n Key=Random_ML_HistoryCount}">
<Slider x:Name="MLAvoidanceHistorySlider" <Slider x:Name="MLAvoidanceHistorySlider"
@@ -138,29 +131,25 @@
<TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}"
Text="{i18n:I18n Key=Timer_Title}" /> Text="{i18n:I18n Key=Timer_Title}" />
<ui:SettingsCard Header="{i18n:I18n Key=Timer_UseLegacyButtons}"> <controls:LabeledSettingsCard x:Name="ToggleSwitchUseLegacyTimerUI"
<ui:ToggleSwitch x:Name="ToggleSwitchUseLegacyTimerUI" Header="{i18n:I18n Key=Timer_UseLegacyButtons}"
IsOn="False" IsOn="False"
Toggled="ToggleSwitchUseLegacyTimerUI_Toggled"/> Toggled="ToggleSwitchUseLegacyTimerUI_Toggled"/>
</ui:SettingsCard>
<ui:SettingsCard Header="{i18n:I18n Key=Timer_NewUI}"> <controls:LabeledSettingsCard x:Name="ToggleSwitchUseNewStyleUI"
<ui:ToggleSwitch x:Name="ToggleSwitchUseNewStyleUI" Header="{i18n:I18n Key=Timer_NewUI}"
IsOn="False" IsOn="False"
Toggled="ToggleSwitchUseNewStyleUI_Toggled"/> Toggled="ToggleSwitchUseNewStyleUI_Toggled"/>
</ui:SettingsCard>
<ui:SettingsCard Header="{i18n:I18n Key=Timer_EnableCountUp}"> <controls:LabeledSettingsCard x:Name="ToggleSwitchEnableOvertimeCountUp"
<ui:ToggleSwitch x:Name="ToggleSwitchEnableOvertimeCountUp" Header="{i18n:I18n Key=Timer_EnableCountUp}"
IsOn="False" IsOn="False"
Toggled="ToggleSwitchEnableOvertimeCountUp_Toggled"/> Toggled="ToggleSwitchEnableOvertimeCountUp_Toggled"/>
</ui:SettingsCard>
<ui:SettingsCard Header="{i18n:I18n Key=Timer_OvertimeHighlight}"> <controls:LabeledSettingsCard x:Name="ToggleSwitchEnableOvertimeRedText"
<ui:ToggleSwitch x:Name="ToggleSwitchEnableOvertimeRedText" Header="{i18n:I18n Key=Timer_OvertimeHighlight}"
IsOn="True" IsOn="True"
Toggled="ToggleSwitchEnableOvertimeRedText_Toggled"/> Toggled="ToggleSwitchEnableOvertimeRedText_Toggled"/>
</ui:SettingsCard>
<ui:SettingsCard Header="{i18n:I18n Key=Timer_Volume}"> <ui:SettingsCard Header="{i18n:I18n Key=Timer_Volume}">
<Slider x:Name="TimerVolumeSlider" <Slider x:Name="TimerVolumeSlider"
@@ -177,11 +166,10 @@
</ikw:SimpleStackPanel> </ikw:SimpleStackPanel>
</ui:SettingsCard> </ui:SettingsCard>
<ui:SettingsCard Header="{i18n:I18n Key=Timer_Progressive}"> <controls:LabeledSettingsCard x:Name="ToggleSwitchEnableProgressiveReminder"
<ui:ToggleSwitch x:Name="ToggleSwitchEnableProgressiveReminder" Header="{i18n:I18n Key=Timer_Progressive}"
IsOn="False" IsOn="False"
Toggled="ToggleSwitchEnableProgressiveReminder_Toggled"/> Toggled="ToggleSwitchEnableProgressiveReminder_Toggled"/>
</ui:SettingsCard>
<ui:SettingsCard Header="{i18n:I18n Key=Timer_ProgressiveVolume}"> <ui:SettingsCard Header="{i18n:I18n Key=Timer_ProgressiveVolume}">
<Slider x:Name="ProgressiveReminderVolumeSlider" <Slider x:Name="ProgressiveReminderVolumeSlider"