fix: cutted text with content only long text

unoplatform · Feb 13, 2024 · 75050de · 75050de
1 parent 2ef809a
commit 75050de
Showing 1 changed file with 7 additions and 4 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
@@ -27,7 +27,8 @@
 			<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>
+
 			<!--  FAB Resources  -->
 			<x:Double x:Key="FabTabBarItemOffset">-32</x:Double>
 			<x:Double x:Key="FabTabBarItemContentWidthOrHeight">16</x:Double>
@@ -222,7 +223,8 @@
 			<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>
+
 			<!--  FAB Resources  -->
 			<x:Double x:Key="FabTabBarItemOffset">-32</x:Double>
 			<x:Double x:Key="FabTabBarItemContentWidthOrHeight">16</x:Double>
@@ -989,8 +991,9 @@
                                 <VisualState x:Name="ContentOnly">
                                     <VisualState.Setters>
                                         <Setter Target="IconBox.Visibility" Value="Collapsed" />
-                                        <Setter Target="ContentPresenter.Margin" Value="12,0" />
-                                        <Setter Target="IconRow.Width" Value="0" />
+										<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>
                                 </VisualState>