Skip to content

Commit

Permalink
fix: cupertino tabbar sliding (#605)
Browse files Browse the repository at this point in the history
fix: added for mobile too

fix: cupertino tabbar sliding

test: android dispatcher for selection indicator

Revert "test: android dispatcher for selection indicator"

This reverts commit e23a3fb.

revert

fix: cupertino tabbar sliding

refactor: some style attributes

fix: cupertino tabbar sliding

fix: adding back template

fix: put template last

fix: reverting changes + height fix

fix: cupertino tabbar sliding
  • Loading branch information
rajamatt committed Jul 19, 2023
1 parent 342fe90 commit 84f5ef9
Show file tree
Hide file tree
Showing 2 changed files with 179 additions and 196 deletions.
5 changes: 4 additions & 1 deletion src/Uno.Toolkit.UI/Controls/TabBar/TabBar.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
<x:Double x:Key="TabBarHeightOrWidth">64</x:Double>
<x:Double x:Key="TabBarItemIconHeight">16</x:Double>
<x:Double x:Key="TabBarItemIconWidth">16</x:Double>
<x:Double x:Key="TabBarCornerRadius">8</x:Double>
<Thickness x:Key="TabBarItemContentMargin">0,0,0,12</Thickness>
<Thickness x:Key="TabBarItemContentOnlyMargin">12,0</Thickness>
<Duration x:Key="TabBarIndicatorAnimationDuration">0:0:0.25</Duration>
Expand All @@ -64,13 +65,15 @@
</Setter>
<Setter Property="ItemContainerStyle" Value="{StaticResource DefaultTabBarItemStyle}" />
<Setter Property="SelectionIndicatorPresenterStyle" Value="{StaticResource DefaultTabBarSelectionIndicatorPresenterStyle}" />
<Setter Property="CornerRadius" Value="{ThemeResource TabBarCornerRadius}"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="utu:TabBar">
<Grid x:Name="TabBarGrid"
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}">
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding CornerRadius}">
<VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="OrientationStates">
<VisualState x:Name="Horizontal">
Expand Down
Loading

0 comments on commit 84f5ef9

Please sign in to comment.