chore: Adjusting icon position and TextBox size

unoplatform · Nov 2, 2023 · 7c22d38 · 7c22d38
1 parent f43dacb
commit 7c22d38
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/src/library/Uno.Material/Styles/Controls/v2/TextBox.xaml b/src/library/Uno.Material/Styles/Controls/v2/TextBox.xaml
@@ -137,7 +137,7 @@
 			<!--#region Filled TextBox Style-->
 			<CornerRadius x:Key="MaterialFilledTextBoxCornerRadius">4,4,0,0</CornerRadius>
 			<macos:Thickness x:Key="MaterialFilledTextBoxPadding">16,7</macos:Thickness>
-			<not_macos:Thickness x:Key="MaterialFilledTextBoxPadding">16,10</not_macos:Thickness>
+			<not_macos:Thickness x:Key="MaterialFilledTextBoxPadding">16,8</not_macos:Thickness>
 			<x:Double x:Key="MaterialFilledTextBoxMinHeight">58</x:Double>
 			<x:Double x:Key="MaterialFilledTextBoxBorderHeightFocused">2</x:Double>
 			<!--#endregion-->
@@ -146,7 +146,7 @@
 			<x:Double x:Key="MaterialOutlinedTextBoxBorderThickness">1</x:Double>
 			<CornerRadius x:Key="MaterialOutlinedTextBoxCornerRadius">4</CornerRadius>
 			<macos:Thickness x:Key="MaterialOutlinedTextBoxPadding">16,7,14,7</macos:Thickness>
-			<not_macos:Thickness x:Key="MaterialOutlinedTextBoxPadding">16,10</not_macos:Thickness>
+			<not_macos:Thickness x:Key="MaterialOutlinedTextBoxPadding">16,8</not_macos:Thickness>
 			<x:Double x:Key="MaterialOutlinedTextBoxMinHeight">56</x:Double>
 			<Thickness x:Key="MaterialOutlinedTextBoxBorderPadding">1</Thickness>
 			<x:Double x:Key="MaterialOutlinedTextBoxBorderThicknessFocused">2</x:Double>
@@ -236,7 +236,7 @@
 			<!--#region Filled TextBox Style-->
 			<CornerRadius x:Key="MaterialFilledTextBoxCornerRadius">4,4,0,0</CornerRadius>
 			<macos:Thickness x:Key="MaterialFilledTextBoxPadding">16,7</macos:Thickness>
-			<not_macos:Thickness x:Key="MaterialFilledTextBoxPadding">16,10</not_macos:Thickness>
+			<not_macos:Thickness x:Key="MaterialFilledTextBoxPadding">16,8</not_macos:Thickness>
 			<x:Double x:Key="MaterialFilledTextBoxMinHeight">58</x:Double>
 			<x:Double x:Key="MaterialFilledTextBoxBorderHeightFocused">2</x:Double>
 			<!--#endregion-->
@@ -245,7 +245,7 @@
 			<x:Double x:Key="MaterialOutlinedTextBoxBorderThickness">1</x:Double>
 			<CornerRadius x:Key="MaterialOutlinedTextBoxCornerRadius">4</CornerRadius>
 			<macos:Thickness x:Key="MaterialOutlinedTextBoxPadding">16,7,14,7</macos:Thickness>
-			<not_macos:Thickness x:Key="MaterialOutlinedTextBoxPadding">16,10</not_macos:Thickness>
+			<not_macos:Thickness x:Key="MaterialOutlinedTextBoxPadding">16,8</not_macos:Thickness>
 			<x:Double x:Key="MaterialOutlinedTextBoxMinHeight">56</x:Double>
 			<Thickness x:Key="MaterialOutlinedTextBoxBorderPadding">1</Thickness>
 			<x:Double x:Key="MaterialOutlinedTextBoxBorderThicknessFocused">2</x:Double>
@@ -363,9 +363,6 @@
 												Value="{ThemeResource FilledTextBoxDeleteButtonForegroundPointerOver}" />
 										<Setter Target="NormalBorder.Height" 
 												Value="2" />
-										<Setter Target="PlaceholderBorder.Visibility" 
-												Value="{Binding Header, Converter={StaticResource MaterialEmptyToVisible}, RelativeSource={RelativeSource TemplatedParent}}" />
-
 										<!--Keep the Header upwards-->
 
 										<!-- If Text Header Placeholder needs to keep UP-->
@@ -483,7 +480,7 @@
 								<ContentPresenter x:Name="IconPresenter"
 												  Content="{Binding Path=(um:ControlExtensions.Icon), RelativeSource={RelativeSource TemplatedParent}}"
 												  HorizontalAlignment="Center"
-												  Margin="0,8,8,0"
+												  Margin="0,11,8,0"
 												  MaxHeight="34"
 												  MaxWidth="34"
 												  MinWidth="25"