From 055b343571b4698db7369007210c244ae3719043 Mon Sep 17 00:00:00 2001
From: DismissedLight <1686188646@qq.com>
Date: Mon, 25 Dec 2023 19:40:43 +0800
Subject: [PATCH] fixup

---
 .../Snap.Hutao/Control/Theme/FlyoutStyle.xaml |  6 ++
 .../Snap.Hutao/View/Page/SettingPage.xaml     | 92 ++++++++++---------
 2 files changed, 54 insertions(+), 44 deletions(-)

diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Theme/FlyoutStyle.xaml b/src/Snap.Hutao/Snap.Hutao/Control/Theme/FlyoutStyle.xaml
index 955fffba..8d3533f5 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Theme/FlyoutStyle.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Theme/FlyoutStyle.xaml
@@ -18,4 +18,10 @@
         TargetType="FlyoutPresenter">
         <Setter Property="Padding" Value="6"/>
     </Style>
+    <Style
+        x:Key="FlyoutPresenterPadding16And10Style"
+        BasedOn="{StaticResource DefaultFlyoutPresenterStyle}"
+        TargetType="FlyoutPresenter">
+        <Setter Property="Padding" Value="16,10"/>
+    </Style>
 </ResourceDictionary>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml
index f79176ae..f9e3eb16 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml
@@ -219,50 +219,54 @@
                     Description="{shcm:ResourceString Name=ViewPageSettingKeyShortcutAutoClickingDescription}"
                     Header="{shcm:ResourceString Name=ViewPageSettingKeyShortcutAutoClickingHeader}"
                     HeaderIcon="{shcm:FontIcon Glyph=&#xE92E;}">
-                    <StackPanel Orientation="Horizontal">
-                        <StackPanel Orientation="Horizontal" Spacing="8">
-                            <Button VerticalAlignment="Center">
-                                <FontIcon Glyph="&#xEDA7;"/>
-                                <Button.Flyout>
-                                    <Flyout>
-                                        <cwc:UniformGrid
-                                            ColumnSpacing="16"
-                                            Columns="2"
-                                            Orientation="Horizontal"
-                                            RowSpacing="0">
-                                            <CheckBox
-                                                MinWidth="64"
-                                                VerticalAlignment="Center"
-                                                Content="Win"
-                                                IsChecked="{Binding HotKeyOptions.MouseClickRepeatForeverKeyCombination.ModifierHasWindows, Mode=TwoWay}"/>
-                                            <CheckBox
-                                                MinWidth="64"
-                                                VerticalAlignment="Center"
-                                                Content="Ctrl"
-                                                IsChecked="{Binding HotKeyOptions.MouseClickRepeatForeverKeyCombination.ModifierHasControl, Mode=TwoWay}"/>
-                                            <CheckBox
-                                                MinWidth="64"
-                                                VerticalAlignment="Center"
-                                                Content="Shift"
-                                                IsChecked="{Binding HotKeyOptions.MouseClickRepeatForeverKeyCombination.ModifierHasShift, Mode=TwoWay}"/>
-                                            <CheckBox
-                                                MinWidth="64"
-                                                VerticalAlignment="Center"
-                                                Content="Alt"
-                                                IsChecked="{Binding HotKeyOptions.MouseClickRepeatForeverKeyCombination.ModifierHasAlt, Mode=TwoWay}"/>
-                                        </cwc:UniformGrid>
-                                    </Flyout>
-                                </Button.Flyout>
-                            </Button>
-                            <shc:SizeRestrictedContentControl>
-                                <ComboBox
-                                    MinWidth="120"
-                                    VerticalAlignment="Center"
-                                    DisplayMemberPath="Name"
-                                    ItemsSource="{Binding HotKeyOptions.VirtualKeys}"
-                                    SelectedItem="{Binding HotKeyOptions.MouseClickRepeatForeverKeyCombination.KeyNameValue, Mode=TwoWay}"/>
-                            </shc:SizeRestrictedContentControl>
-                        </StackPanel>
+                    <StackPanel Orientation="Horizontal" Spacing="8">
+                        <Button
+                            MinWidth="32"
+                            MinHeight="32"
+                            Padding="0"
+                            VerticalAlignment="Center"
+                            Content="&#xEDA7;"
+                            FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                            Style="{ThemeResource SettingButtonStyle}">
+                            <Button.Flyout>
+                                <Flyout FlyoutPresenterStyle="{ThemeResource FlyoutPresenterPadding16And10Style}">
+                                    <cwc:UniformGrid
+                                        ColumnSpacing="16"
+                                        Columns="2"
+                                        Orientation="Horizontal"
+                                        RowSpacing="0">
+                                        <CheckBox
+                                            MinWidth="64"
+                                            VerticalAlignment="Center"
+                                            Content="Win"
+                                            IsChecked="{Binding HotKeyOptions.MouseClickRepeatForeverKeyCombination.ModifierHasWindows, Mode=TwoWay}"/>
+                                        <CheckBox
+                                            MinWidth="64"
+                                            VerticalAlignment="Center"
+                                            Content="Ctrl"
+                                            IsChecked="{Binding HotKeyOptions.MouseClickRepeatForeverKeyCombination.ModifierHasControl, Mode=TwoWay}"/>
+                                        <CheckBox
+                                            MinWidth="64"
+                                            VerticalAlignment="Center"
+                                            Content="Shift"
+                                            IsChecked="{Binding HotKeyOptions.MouseClickRepeatForeverKeyCombination.ModifierHasShift, Mode=TwoWay}"/>
+                                        <CheckBox
+                                            MinWidth="64"
+                                            VerticalAlignment="Center"
+                                            Content="Alt"
+                                            IsChecked="{Binding HotKeyOptions.MouseClickRepeatForeverKeyCombination.ModifierHasAlt, Mode=TwoWay}"/>
+                                    </cwc:UniformGrid>
+                                </Flyout>
+                            </Button.Flyout>
+                        </Button>
+                        <shc:SizeRestrictedContentControl VerticalAlignment="Center">
+                            <ComboBox
+                                MinWidth="120"
+                                VerticalAlignment="Center"
+                                DisplayMemberPath="Name"
+                                ItemsSource="{Binding HotKeyOptions.VirtualKeys}"
+                                SelectedItem="{Binding HotKeyOptions.MouseClickRepeatForeverKeyCombination.KeyNameValue, Mode=TwoWay}"/>
+                        </shc:SizeRestrictedContentControl>
                         <ToggleSwitch
                             MinWidth="120"
                             VerticalAlignment="Center"