From 3c29b8efdf41c3fedd90eb3601dbe6ed72102c86 Mon Sep 17 00:00:00 2001
From: rmbgame <rmb@rmbgame.net>
Date: Wed, 23 Jun 2021 14:29:22 +0800
Subject: [PATCH] Flyout Style Fix

---
 .../Application/UI/Views/MainView.axaml                  | 9 +++++----
 .../Application/UI/Views/Pages/GameListPage.axaml        | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/MainView.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/MainView.axaml
index 7f70d7b83..901f28dea 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/MainView.axaml
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/MainView.axaml
@@ -76,12 +76,12 @@
                Width="250"
                HorizontalOffset="-205"
                IsLightDismissEnabled="True">
-          <Border Background="{DynamicResource ThemeBrushKey}"
+          <Border Background="{DynamicResource MenuFlyoutPresenterBackground}"
                      HorizontalAlignment="Stretch"
                      CornerRadius="{DynamicResource OverlayCornerRadius}">
             <StackPanel>
               <Panel x:Name="UserMenu" Width="300" Margin="0 20">
-                <StackPanel Spacing="10">
+                <StackPanel>
                   <Image Source="{ReflectionBinding Path=AvaterPath, Source={x:Static service:UserService.Current},Mode=OneWay,Converter={StaticResource BitmapAssetValueConverter},ConverterParameter=100}"
                          Stretch="Uniform"
                          Height="100" Width="100"
@@ -92,13 +92,14 @@
                   </Image>
                   <TextBlock
                     Text="{ReflectionBinding Path=User.NickName,Mode=OneWay,Source={x:Static service:UserService.Current}}"
+                    Margin="0 10 0 0"
                     FontSize="14"
                     HorizontalAlignment="Center"
                     Foreground="{DynamicResource HighlightForegroundBrushKey}"></TextBlock>
                 </StackPanel>
               </Panel>
-              <ListBox SelectionMode="Single" Classes="metro"
-                       Background="{DynamicResource ThemeBrushKey}">
+              <Separator Classes="Separator"></Separator>
+              <ListBox SelectionMode="Single" Classes="metro" Background="Transparent">
                 <ListBox.Styles>
                   <Style Selector="Button">
                     <Setter Property="Width" Value="{Binding #UserMenu.Width}"></Setter>
diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameListPage.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameListPage.axaml
index a452e018d..bbd003e37 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameListPage.axaml
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameListPage.axaml
@@ -136,7 +136,7 @@
               PlacementTarget="typebutton"
               HorizontalOffset="-1.5"
               IsLightDismissEnabled="True">
-            <Border Background="{DynamicResource BackgroundBrushKey}"
+            <Border Background="{DynamicResource MenuFlyoutPresenterBackground}"
                     Classes="dialog"
                     Width="{Binding $parent.Width}" Height="200">
               <ScrollViewer Padding="10 5">