Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions components/Segmented/src/SegmentedItem/SegmentedItem.xaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="using:CommunityToolkit.WinUI.Controls"
xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
Expand Down Expand Up @@ -361,6 +361,8 @@
</ResourceDictionary.ThemeDictionaries>

<x:String x:Key="SegmentedItemScaleAnimationDuration">00:00:00.167</x:String>
<win:BrushTransition x:Key="SegmentedItemBackgroundBrushTransition"
Duration="0:0:0.083" />

<Style BasedOn="{StaticResource DefaultSegmentedItemStyle}"
TargetType="local:SegmentedItem" />
Expand All @@ -374,6 +376,7 @@
<Thickness x:Key="MiddleItemHoverMargin">1, 3, 1, 3</Thickness>
<Thickness x:Key="RightItemHoverMargin">1, 3, 3, 3</Thickness>
<Thickness x:Key="ButtonItemPadding">11</Thickness>

<Style x:Key="DefaultSegmentedItemStyle"
TargetType="local:SegmentedItem">
<Style.Setters>
Expand All @@ -397,13 +400,11 @@
<Grid x:Name="PART_Root"
VerticalAlignment="{TemplateBinding VerticalAlignment}"
Background="{TemplateBinding Background}"
BackgroundTransition="{ThemeResource SegmentedItemBackgroundBrushTransition}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
Control.IsTemplateFocusTarget="True"
CornerRadius="{TemplateBinding CornerRadius}">
<win:Grid.BackgroundTransition>
<win:BrushTransition Duration="0:0:0.083" />
</win:Grid.BackgroundTransition>
<VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="SegmentedIconPositionStates">
<VisualState x:Name="IconOnLeft" />
Expand Down Expand Up @@ -614,11 +615,9 @@
<Border x:Name="PART_Hover"
Margin="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Converter={StaticResource MarginConverter}}"
Background="Transparent"
BackgroundTransition="{ThemeResource SegmentedItemBackgroundBrushTransition}"
CornerRadius="{TemplateBinding CornerRadius}"
RenderTransformOrigin="0.5, 0.5">
<win:Border.BackgroundTransition>
<win:BrushTransition Duration="0:0:0.083" />
</win:Border.BackgroundTransition>
<Border.RenderTransform>
<CompositeTransform />
</Border.RenderTransform>
Expand Down Expand Up @@ -925,11 +924,9 @@
<Grid x:Name="PART_Root"
Background="{TemplateBinding Background}"
BackgroundSizing="{TemplateBinding BackgroundSizing}"
BackgroundTransition="{ThemeResource SegmentedItemBackgroundBrushTransition}"
Control.IsTemplateFocusTarget="True"
CornerRadius="{TemplateBinding CornerRadius}">
<win:Grid.BackgroundTransition>
<win:BrushTransition Duration="0:0:0.083" />
</win:Grid.BackgroundTransition>
<VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="SegmentedIconPositionStates">
<VisualState x:Name="IconOnLeft" />
Expand Down
Loading