From 3bfac4d1432a9e34c81d1b0e285e41146e233e9a Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Thu, 26 Jan 2023 00:15:33 +0800
Subject: [PATCH 1/2] fix: fix textbox padding issue.

---
 src/Semi.Avalonia/Controls/TextBox.axaml     | 3 +--
 src/Semi.Avalonia/Themes/Light/TextBox.axaml | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Semi.Avalonia/Controls/TextBox.axaml b/src/Semi.Avalonia/Controls/TextBox.axaml
index ecde692..963a55c 100644
--- a/src/Semi.Avalonia/Controls/TextBox.axaml
+++ b/src/Semi.Avalonia/Controls/TextBox.axaml
@@ -85,7 +85,7 @@
                     BorderBrush="{TemplateBinding BorderBrush}"
                     BorderThickness="{TemplateBinding BorderThickness}"
                     CornerRadius="{DynamicResource TextBoxDefaultCornerRadius}">
-                    <Grid ColumnDefinitions="Auto,*,Auto, Auto, Auto">
+                    <Grid Margin="{TemplateBinding Padding}" ColumnDefinitions="Auto,*,Auto, Auto, Auto">
                         <ContentPresenter
                             Grid.Column="0"
                             Padding="{DynamicResource TextBoxInnerLeftContentPadding}"
@@ -95,7 +95,6 @@
                             IsVisible="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=InnerLeftContent, Converter={x:Static ObjectConverters.IsNotNull}}" />
                         <ScrollViewer
                             Grid.Column="1"
-                            Margin="{TemplateBinding Padding}"
                             AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}"
                             HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
                             IsScrollChainingEnabled="{TemplateBinding (ScrollViewer.IsScrollChainingEnabled)}"
diff --git a/src/Semi.Avalonia/Themes/Light/TextBox.axaml b/src/Semi.Avalonia/Themes/Light/TextBox.axaml
index 1f8f813..d9609be 100644
--- a/src/Semi.Avalonia/Themes/Light/TextBox.axaml
+++ b/src/Semi.Avalonia/Themes/Light/TextBox.axaml
@@ -38,8 +38,8 @@
     <CornerRadius x:Key="TextBoxPrefixContentCornerRadius">0 3 3 0</CornerRadius>
     <CornerRadius x:Key="TextBoxBothContentCornerRadius">0 0 0 0</CornerRadius>
 
-    <Thickness x:Key="TextBoxInnerLeftContentPadding">8 0 0 0</Thickness>
-    <Thickness x:Key="TextBoxInnerRightContentPadding">0 0 8 0</Thickness>
+    <Thickness x:Key="TextBoxInnerLeftContentPadding">0 0 8 0</Thickness>
+    <Thickness x:Key="TextBoxInnerRightContentPadding">8 0 0 0</Thickness>
     <Thickness x:Key="TextBoxContentPadding">8 0</Thickness>
     <Thickness x:Key="TextBoxBorderThickness">1</Thickness>
 

From 7f1c96284392d1546b830ef7b6105e40ce8430c9 Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Thu, 26 Jan 2023 00:23:27 +0800
Subject: [PATCH 2/2] fix: fix menu spacing.

---
 src/Semi.Avalonia/Controls/Menu.axaml     | 7 ++++---
 src/Semi.Avalonia/Themes/Light/Menu.axaml | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/Semi.Avalonia/Controls/Menu.axaml b/src/Semi.Avalonia/Controls/Menu.axaml
index e2baad4..8777a6d 100644
--- a/src/Semi.Avalonia/Controls/Menu.axaml
+++ b/src/Semi.Avalonia/Controls/Menu.axaml
@@ -183,7 +183,7 @@
                             MinHeight="{DynamicResource MenuFlyoutMinHeight}"
                             MaxWidth="{DynamicResource MenuFlyoutMaxWidth}"
                             MaxHeight="{DynamicResource MenuFlyoutMaxHeight}"
-                            Margin="0,4"
+                            Margin="4"
                             Padding="{DynamicResource MenuFlyoutPadding}"
                             HorizontalAlignment="Stretch"
                             Background="{DynamicResource MenuFlyoutBackground}"
@@ -284,14 +284,15 @@
                                 MinHeight="{DynamicResource MenuFlyoutMinHeight}"
                                 MaxWidth="{DynamicResource MenuFlyoutMaxWidth}"
                                 MaxHeight="{DynamicResource MenuFlyoutMaxHeight}"
-                                Margin="0,4"
+                                Margin="4"
+                                Padding="{DynamicResource MenuFlyoutPadding}"
                                 HorizontalAlignment="Stretch"
                                 Background="{DynamicResource MenuFlyoutBackground}"
                                 BorderBrush="{DynamicResource MenuFlyoutBorderBrush}"
                                 BorderThickness="{DynamicResource MenuFlyoutBorderThickness}"
                                 BoxShadow="{DynamicResource MenuFlyoutBorderBoxShadow}"
                                 CornerRadius="{DynamicResource MenuFlyoutCornerRadius}">
-                                <ScrollViewer Padding="{DynamicResource MenuFlyoutPadding}" Theme="{StaticResource MenuScrollViewer}">
+                                <ScrollViewer Theme="{StaticResource MenuScrollViewer}">
                                     <ItemsPresenter
                                         Name="PART_ItemsPresenter"
                                         Grid.IsSharedSizeScope="True"
diff --git a/src/Semi.Avalonia/Themes/Light/Menu.axaml b/src/Semi.Avalonia/Themes/Light/Menu.axaml
index 2f5ebc2..e5b2dbd 100644
--- a/src/Semi.Avalonia/Themes/Light/Menu.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Menu.axaml
@@ -13,7 +13,7 @@
     <SolidColorBrush x:Key="MenuFlyoutBackground" Color="White" />
     <SolidColorBrush x:Key="MenuFlyoutBorderBrush" Opacity="0.08" Color="#1C1F23" />
     <Thickness x:Key="MenuFlyoutBorderThickness">1</Thickness>
-    <Thickness x:Key="MenuFlyoutPadding">8</Thickness>
+    <Thickness x:Key="MenuFlyoutPadding">0 4</Thickness>
     <BoxShadows x:Key="MenuFlyoutBorderBoxShadow">0 0 8 0 #1A000000</BoxShadows>
     <CornerRadius x:Key="MenuFlyoutCornerRadius">3</CornerRadius>
     <sys:Double x:Key="MenuFlyoutMinHeight">16</sys:Double>
@@ -24,7 +24,7 @@
     <!--  MenuItem  -->
     <SolidColorBrush x:Key="MenuItemBackground" Color="White" />
     <SolidColorBrush x:Key="MenuItemForeground" Color="#1C1F23" />
-    <Thickness x:Key="MenuItemPadding">8 4</Thickness>
+    <Thickness x:Key="MenuItemPadding">16 8</Thickness>
 
     <SolidColorBrush x:Key="MenuItemSeparatorBackground" Opacity="0.08" Color="#1C1F23" />
     <sys:Double x:Key="MenuItemSeparatorHeight">1</sys:Double>