wip

unoplatform · Feb 13, 2024 · ea5c537 · ea5c537
1 parent 75050de
commit ea5c537
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/src/library/Uno.Toolkit.Material/Styles/Controls/v2/TabBar.xaml b/src/library/Uno.Toolkit.Material/Styles/Controls/v2/TabBar.xaml
@@ -26,8 +26,8 @@
 			<!--  Top TabBar Resources  -->
 			<x:Double x:Key="TopTabBarHeight">48</x:Double>
 			<x:Double x:Key="TopTabBarItemIconHeight">20</x:Double>
-			<Thickness x:Key="TopTabBarItemContentMargin">0,0,0,0</Thickness>
-			<Thickness x:Key="TopTabBarItemContentOnlyMargin">4,0,4,0</Thickness>
+			<Thickness x:Key="TopTabBarItemContentMargin">8,0,0,0</Thickness>
+			<Thickness x:Key="TopTabBarItemContentOnlyMargin">0</Thickness>
 
 			<!--  FAB Resources  -->
 			<x:Double x:Key="FabTabBarItemOffset">-32</x:Double>
@@ -222,8 +222,8 @@
 			<!--  Top TabBar Resources  -->
 			<x:Double x:Key="TopTabBarHeight">48</x:Double>
 			<x:Double x:Key="TopTabBarItemIconHeight">20</x:Double>
-			<Thickness x:Key="TopTabBarItemContentMargin">0,0,0,0</Thickness>
-			<Thickness x:Key="TopTabBarItemContentOnlyMargin">4,0,4,0</Thickness>
+			<Thickness x:Key="TopTabBarItemContentMargin">8,0,0,0</Thickness>
+			<Thickness x:Key="TopTabBarItemContentOnlyMargin">0</Thickness>
 
 			<!--  FAB Resources  -->
 			<x:Double x:Key="FabTabBarItemOffset">-32</x:Double>
@@ -880,7 +880,7 @@
                                         Fill="{ThemeResource TopTabBarItemPointerFillBrush}"
                                         Visibility="Collapsed" />
 
-                                    <Grid x:Name="ContentGrid" ColumnSpacing="8">
+                                    <Grid x:Name="ContentGrid">
                                         <Grid.ColumnDefinitions>
                                             <ColumnDefinition x:Name="IconRow" Width="*" />
                                             <ColumnDefinition x:Name="ContentRow" Width="Auto" />
@@ -992,7 +992,6 @@
                                     <VisualState.Setters>
                                         <Setter Target="IconBox.Visibility" Value="Collapsed" />
 										<Setter Target="ContentPresenter.Margin" Value="{ThemeResource TopTabBarItemContentOnlyMargin}" />
-										<Setter Target="ContentPresenter.TextTrimming" Value="CharacterEllipsis" />
 										<Setter Target="IconRow.Width" Value="0" />
                                         <Setter Target="ContentRow.Width" Value="*" />
                                     </VisualState.Setters>