diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Helper/ScrollViewerHelper.cs b/src/Snap.Hutao/Snap.Hutao/Control/Helper/ScrollViewerHelper.cs index 11f0d0c7..b8cb9aff 100644 --- a/src/Snap.Hutao/Snap.Hutao/Control/Helper/ScrollViewerHelper.cs +++ b/src/Snap.Hutao/Snap.Hutao/Control/Helper/ScrollViewerHelper.cs @@ -7,7 +7,6 @@ using Microsoft.UI.Xaml.Controls; namespace Snap.Hutao.Control.Helper; [SuppressMessage("", "SH001")] -[DependencyProperty("LeftPanelMaxWidth", typeof(double), IsAttached = true, AttachedType = typeof(ScrollViewer))] [DependencyProperty("RightPanel", typeof(UIElement), IsAttached = true, AttachedType = typeof(ScrollViewer))] public sealed partial class ScrollViewerHelper { diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Theme/ScrollViewer.xaml b/src/Snap.Hutao/Snap.Hutao/Control/Theme/ScrollViewer.xaml index d0190712..0395733d 100644 --- a/src/Snap.Hutao/Snap.Hutao/Control/Theme/ScrollViewer.xaml +++ b/src/Snap.Hutao/Snap.Hutao/Control/Theme/ScrollViewer.xaml @@ -42,7 +42,7 @@ Grid.ColumnSpan="2" Margin="{TemplateBinding Padding}"> - + diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml index 42f847e6..85eab399 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml +++ b/src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml @@ -21,413 +21,525 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + ItemsSource="{Binding AppOptions.LazyRegions.Value}" + SelectedItem="{Binding SelectedRegion, Mode=TwoWay}"/> + + + + + + + - - + IsOn="{Binding AppOptions.IsEmptyHistoryWishVisible, Mode=TwoWay}" + OffContent="{shcm:ResourceString Name=ViewPageSettingEmptyHistoryVisibleOff}" + OnContent="{shcm:ResourceString Name=ViewPageSettingEmptyHistoryVisibleOn}"/> + - - - - - - - - - - - - - - - - - - - - - - + + + +