From 500f6526b02162d4a60057675bce653550ad92df Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Mon, 30 Jan 2023 23:06:58 +0800
Subject: [PATCH] fix: fix multiple dropdown/popup/flyout margin and corner
 radius.

---
 src/Semi.Avalonia/Controls/Menu.axaml                | 9 ++++++---
 src/Semi.Avalonia/Controls/MenuFlyoutPresenter.axaml | 2 +-
 src/Semi.Avalonia/Controls/NotificationCard.axaml    | 4 ++--
 src/Semi.Avalonia/Themes/Light/AutoCompleteBox.axaml | 2 +-
 src/Semi.Avalonia/Themes/Light/Menu.axaml            | 2 +-
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/Semi.Avalonia/Controls/Menu.axaml b/src/Semi.Avalonia/Controls/Menu.axaml
index 8777a6d..e20a48e 100644
--- a/src/Semi.Avalonia/Controls/Menu.axaml
+++ b/src/Semi.Avalonia/Controls/Menu.axaml
@@ -172,18 +172,19 @@
                     </Border>
                     <Popup
                         Name="PART_Popup"
-                        HorizontalOffset="{DynamicResource MenuFlyoutSubItemPopupHorizontalOffset}"
+                        HorizontalOffset="-8"
                         IsLightDismissEnabled="False"
                         IsOpen="{TemplateBinding IsSubMenuOpen,
                                                  Mode=TwoWay}"
                         PlacementMode="Right"
+                        VerticalOffset="-4"
                         WindowManagerAddShadowHint="False">
                         <Border
                             MinWidth="{DynamicResource MenuFlyoutMinWidth}"
                             MinHeight="{DynamicResource MenuFlyoutMinHeight}"
                             MaxWidth="{DynamicResource MenuFlyoutMaxWidth}"
                             MaxHeight="{DynamicResource MenuFlyoutMaxHeight}"
-                            Margin="4"
+                            Margin="8"
                             Padding="{DynamicResource MenuFlyoutPadding}"
                             HorizontalAlignment="Stretch"
                             Background="{DynamicResource MenuFlyoutBackground}"
@@ -274,17 +275,19 @@
                         <Popup
                             Name="PART_Popup"
                             MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}"
+                            HorizontalOffset="-8"
                             IsLightDismissEnabled="True"
                             IsOpen="{TemplateBinding IsSubMenuOpen,
                                                      Mode=TwoWay}"
                             OverlayInputPassThroughElement="{Binding $parent[Menu]}"
+                            VerticalOffset="-4"
                             WindowManagerAddShadowHint="False">
                             <Border
                                 MinWidth="{DynamicResource MenuFlyoutMinWidth}"
                                 MinHeight="{DynamicResource MenuFlyoutMinHeight}"
                                 MaxWidth="{DynamicResource MenuFlyoutMaxWidth}"
                                 MaxHeight="{DynamicResource MenuFlyoutMaxHeight}"
-                                Margin="4"
+                                Margin="8"
                                 Padding="{DynamicResource MenuFlyoutPadding}"
                                 HorizontalAlignment="Stretch"
                                 Background="{DynamicResource MenuFlyoutBackground}"
diff --git a/src/Semi.Avalonia/Controls/MenuFlyoutPresenter.axaml b/src/Semi.Avalonia/Controls/MenuFlyoutPresenter.axaml
index 887c2a1..0df414c 100644
--- a/src/Semi.Avalonia/Controls/MenuFlyoutPresenter.axaml
+++ b/src/Semi.Avalonia/Controls/MenuFlyoutPresenter.axaml
@@ -20,7 +20,7 @@
                     MinHeight="{DynamicResource MenuFlyoutMinHeight}"
                     MaxWidth="{DynamicResource MenuFlyoutMaxWidth}"
                     MaxHeight="{DynamicResource MenuFlyoutMaxHeight}"
-                    Margin="0,4"
+                    Margin="8"
                     Padding="{DynamicResource MenuFlyoutPadding}"
                     HorizontalAlignment="Stretch"
                     Background="{DynamicResource MenuFlyoutBackground}"
diff --git a/src/Semi.Avalonia/Controls/NotificationCard.axaml b/src/Semi.Avalonia/Controls/NotificationCard.axaml
index 6034231..dd24a39 100644
--- a/src/Semi.Avalonia/Controls/NotificationCard.axaml
+++ b/src/Semi.Avalonia/Controls/NotificationCard.axaml
@@ -18,8 +18,8 @@
             <ControlTemplate TargetType="NotificationCard">
                 <LayoutTransformControl Name="PART_LayoutTransformControl" UseRenderTransform="True">
                     <Border
-                        Margin="4"
-                        BoxShadow="0 0 14 #1A000000"
+                        Margin="8"
+                        BoxShadow="0 0 8 0 #1A000000"
                         CornerRadius="{TemplateBinding CornerRadius}">
                         <Border
                             Background="{TemplateBinding Background}"
diff --git a/src/Semi.Avalonia/Themes/Light/AutoCompleteBox.axaml b/src/Semi.Avalonia/Themes/Light/AutoCompleteBox.axaml
index d912ebb..2a44670 100644
--- a/src/Semi.Avalonia/Themes/Light/AutoCompleteBox.axaml
+++ b/src/Semi.Avalonia/Themes/Light/AutoCompleteBox.axaml
@@ -5,7 +5,7 @@
     <SolidColorBrush x:Key="AutoCompleteBoxPopupBackground" Color="White" />
     <SolidColorBrush x:Key="AutoCompleteBoxPopupBorderBrush" Opacity="0.08" Color="#1C1F23" />
     <Thickness x:Key="AutoCompleteBoxPopupBorderThickness">1</Thickness>
-    <Thickness x:Key="AutoCompleteBoxPopupMargin">0 4</Thickness>
+    <Thickness x:Key="AutoCompleteBoxPopupMargin">4</Thickness>
     <CornerRadius x:Key="AutoCompleteBoxPopupCornerRadius">6</CornerRadius>
     <SolidColorBrush x:Key="AutoCompleteBoxBorderlessBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="AutoCompleteBoxBorderlessBackground" Opacity="0.05" Color="#2E3238" />
diff --git a/src/Semi.Avalonia/Themes/Light/Menu.axaml b/src/Semi.Avalonia/Themes/Light/Menu.axaml
index e5b2dbd..b768eb6 100644
--- a/src/Semi.Avalonia/Themes/Light/Menu.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Menu.axaml
@@ -15,7 +15,7 @@
     <Thickness x:Key="MenuFlyoutBorderThickness">1</Thickness>
     <Thickness x:Key="MenuFlyoutPadding">0 4</Thickness>
     <BoxShadows x:Key="MenuFlyoutBorderBoxShadow">0 0 8 0 #1A000000</BoxShadows>
-    <CornerRadius x:Key="MenuFlyoutCornerRadius">3</CornerRadius>
+    <CornerRadius x:Key="MenuFlyoutCornerRadius">6</CornerRadius>
     <sys:Double x:Key="MenuFlyoutMinHeight">16</sys:Double>
     <sys:Double x:Key="MenuFlyoutMinWidth">100</sys:Double>
     <sys:Double x:Key="MenuFlyoutMaxHeight">400</sys:Double>