From b8886c5cd318114cc8b8a46d22ddc67ac8b3b8c0 Mon Sep 17 00:00:00 2001
From: Lightczx <1686188646@qq.com>
Date: Mon, 6 Nov 2023 13:46:59 +0800
Subject: [PATCH] fix #1072

---
 .../Snap.Hutao/View/Page/SettingPage.xaml     | 119 +++++++++---------
 1 file changed, 62 insertions(+), 57 deletions(-)

diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml
index 6c867801..269841f3 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml
@@ -94,63 +94,68 @@
                         <cwc:SettingsCard Description="{Binding HutaoOptions.WebView2Version}" Header="{shcm:ResourceString Name=ViewPageSettingWebview2Header}"/>
                     </cwc:SettingsExpander.Items>
                 </cwc:SettingsExpander>
-                <cwc:SettingsExpander
-                    Description="{Binding UserOptions.UserName}"
-                    Header="{shcm:ResourceString Name=ViewPageSettingHutaoPassportHeader}"
-                    HeaderIcon="{shcm:FontIcon Glyph=&#xE716;}"
-                    IsExpanded="True">
-                    <StackPanel Orientation="Horizontal" Spacing="16">
-                        <Button
-                            Command="{Binding Passport.LoginCommand}"
-                            Content="{shcm:ResourceString Name=ViewPageSettingHutaoPassportLoginAction}"
-                            Style="{ThemeResource SettingButtonStyle}"
-                            Visibility="{Binding UserOptions.IsLoggedIn, Converter={StaticResource BoolToVisibilityRevertConverter}}"/>
-                        <Button
-                            Command="{Binding Passport.RegisterCommand}"
-                            Content="{shcm:ResourceString Name=ViewPageSettingHutaoPassportRegisterAction}"
-                            Style="{ThemeResource SettingButtonStyle}"
-                            Visibility="{Binding UserOptions.IsLoggedIn, Converter={StaticResource BoolToVisibilityRevertConverter}}"/>
-                        <Button
-                            Command="{Binding Passport.LogoutCommand}"
-                            Content="{shcm:ResourceString Name=ViewPageSettingHutaoPassportLogoutAction}"
-                            Style="{ThemeResource SettingButtonStyle}"
-                            Visibility="{Binding UserOptions.IsLoggedIn, Converter={StaticResource BoolToVisibilityConverter}}"/>
-                    </StackPanel>
-                    <cwc:SettingsExpander.Items>
-                        <cwc:SettingsCard
-                            Background="{ThemeResource SystemFillColorSuccessBackgroundBrush}"
-                            Description="{shcm:ResourceString Name=ViewPageSettingHutaoPassportLicensedDeveloperDescription}"
-                            Header="{shcm:ResourceString Name=ViewPageSettingHutaoPassportLicensedDeveloperHeader}"
-                            Visibility="{Binding UserOptions.IsLicensedDeveloper, Converter={StaticResource BoolToVisibilityConverter}}"/>
-                        <cwc:SettingsCard
-                            Background="{ThemeResource SystemFillColorSuccessBackgroundBrush}"
-                            Description="{shcm:ResourceString Name=ViewPageSettingHutaoPassportMaintainerDescription}"
-                            Header="{shcm:ResourceString Name=ViewPageSettingHutaoPassportMaintainerHeader}"
-                            Visibility="{Binding UserOptions.IsMaintainer, Converter={StaticResource BoolToVisibilityConverter}}"/>
-                        <cwc:SettingsCard Description="{Binding UserOptions.GachaLogExpireAtSlim}" Header="{shcm:ResourceString Name=ViewPageSettingHutaoPassportGachaLogExpiredAtHeader}"/>
-                        <cwc:SettingsCard
-                            Command="{Binding Passport.OpenRedeemWebsiteCommand}"
-                            Description="{shcm:ResourceString Name=ViewPageSettingHutaoPassportRedeemCodeDescription}"
-                            Header="{shcm:ResourceString Name=ViewPageSettingHutaoPassportRedeemCodeHeader}"
-                            IsClickEnabled="True"/>
-                        <cwc:SettingsCard
-                            Background="{ThemeResource SystemFillColorCriticalBackgroundBrush}"
-                            Description="{shcm:ResourceString Name=ViewPageSettingHutaoPassportDangerZoneDescription}"
-                            Header="{shcm:ResourceString Name=ViewPageSettingHutaoPassportDangerZoneHeader}">
-                            <StackPanel Orientation="Horizontal" Spacing="16">
-                                <Button
-                                    Command="{Binding Passport.ResetPasswordCommand}"
-                                    Content="{shcm:ResourceString Name=ViewPageSettingHutaoPassportResetPasswordAction}"
-                                    Style="{ThemeResource SettingButtonStyle}"/>
-                                <Button
-                                    Command="{Binding Passport.UnregisterCommand}"
-                                    Content="{shcm:ResourceString Name=ViewPageSettingHutaoPassportUnregisterAction}"
-                                    Style="{ThemeResource SettingButtonStyle}"/>
-                            </StackPanel>
-                        </cwc:SettingsCard>
-                    </cwc:SettingsExpander.Items>
-                </cwc:SettingsExpander>
-
+                <!--
+                    https://github.com/DGP-Studio/Snap.Hutao/issues/1072
+                    ItemsRepeater will behave abnormal is no direct scrollhost wrapping it
+                -->
+                <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Disabled">
+                    <cwc:SettingsExpander
+                        Description="{Binding UserOptions.UserName}"
+                        Header="{shcm:ResourceString Name=ViewPageSettingHutaoPassportHeader}"
+                        HeaderIcon="{shcm:FontIcon Glyph=&#xE716;}"
+                        IsExpanded="True">
+                        <StackPanel Orientation="Horizontal" Spacing="16">
+                            <Button
+                                Command="{Binding Passport.LoginCommand}"
+                                Content="{shcm:ResourceString Name=ViewPageSettingHutaoPassportLoginAction}"
+                                Style="{ThemeResource SettingButtonStyle}"
+                                Visibility="{Binding UserOptions.IsLoggedIn, Converter={StaticResource BoolToVisibilityRevertConverter}}"/>
+                            <Button
+                                Command="{Binding Passport.RegisterCommand}"
+                                Content="{shcm:ResourceString Name=ViewPageSettingHutaoPassportRegisterAction}"
+                                Style="{ThemeResource SettingButtonStyle}"
+                                Visibility="{Binding UserOptions.IsLoggedIn, Converter={StaticResource BoolToVisibilityRevertConverter}}"/>
+                            <Button
+                                Command="{Binding Passport.LogoutCommand}"
+                                Content="{shcm:ResourceString Name=ViewPageSettingHutaoPassportLogoutAction}"
+                                Style="{ThemeResource SettingButtonStyle}"
+                                Visibility="{Binding UserOptions.IsLoggedIn, Converter={StaticResource BoolToVisibilityConverter}}"/>
+                        </StackPanel>
+                        <cwc:SettingsExpander.Items>
+                            <cwc:SettingsCard
+                                Background="{ThemeResource SystemFillColorSuccessBackgroundBrush}"
+                                Description="{shcm:ResourceString Name=ViewPageSettingHutaoPassportLicensedDeveloperDescription}"
+                                Header="{shcm:ResourceString Name=ViewPageSettingHutaoPassportLicensedDeveloperHeader}"
+                                Visibility="{Binding UserOptions.IsLicensedDeveloper, Converter={StaticResource BoolToVisibilityConverter}}"/>
+                            <cwc:SettingsCard
+                                Background="{ThemeResource SystemFillColorSuccessBackgroundBrush}"
+                                Description="{shcm:ResourceString Name=ViewPageSettingHutaoPassportMaintainerDescription}"
+                                Header="{shcm:ResourceString Name=ViewPageSettingHutaoPassportMaintainerHeader}"
+                                Visibility="{Binding UserOptions.IsMaintainer, Converter={StaticResource BoolToVisibilityConverter}}"/>
+                            <cwc:SettingsCard Description="{Binding UserOptions.GachaLogExpireAtSlim}" Header="{shcm:ResourceString Name=ViewPageSettingHutaoPassportGachaLogExpiredAtHeader}"/>
+                            <cwc:SettingsCard
+                                Command="{Binding Passport.OpenRedeemWebsiteCommand}"
+                                Description="{shcm:ResourceString Name=ViewPageSettingHutaoPassportRedeemCodeDescription}"
+                                Header="{shcm:ResourceString Name=ViewPageSettingHutaoPassportRedeemCodeHeader}"
+                                IsClickEnabled="True"/>
+                            <cwc:SettingsCard
+                                Background="{ThemeResource SystemFillColorCriticalBackgroundBrush}"
+                                Description="{shcm:ResourceString Name=ViewPageSettingHutaoPassportDangerZoneDescription}"
+                                Header="{shcm:ResourceString Name=ViewPageSettingHutaoPassportDangerZoneHeader}">
+                                <StackPanel Orientation="Horizontal" Spacing="16">
+                                    <Button
+                                        Command="{Binding Passport.ResetPasswordCommand}"
+                                        Content="{shcm:ResourceString Name=ViewPageSettingHutaoPassportResetPasswordAction}"
+                                        Style="{ThemeResource SettingButtonStyle}"/>
+                                    <Button
+                                        Command="{Binding Passport.UnregisterCommand}"
+                                        Content="{shcm:ResourceString Name=ViewPageSettingHutaoPassportUnregisterAction}"
+                                        Style="{ThemeResource SettingButtonStyle}"/>
+                                </StackPanel>
+                            </cwc:SettingsCard>
+                        </cwc:SettingsExpander.Items>
+                    </cwc:SettingsExpander>
+                </ScrollViewer>
                 <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageSettingGeetestVerificationHeader}"/>
                 <cwc:SettingsCard
                     ActionIcon="{shcm:FontIcon Glyph=&#xF32A;}"