Skip to content

Commit fd30173

Browse files
Add SegmentedItemBackgroundBrushTransition resource
1 parent d30f407 commit fd30173

1 file changed

Lines changed: 10 additions & 14 deletions

File tree

components/Segmented/src/SegmentedItem/SegmentedItem.xaml

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,8 @@
361361
</ResourceDictionary.ThemeDictionaries>
362362

363363
<x:String x:Key="SegmentedItemScaleAnimationDuration">00:00:00.167</x:String>
364-
364+
<win:BrushTransition x:Key="SegmentedItemBackgroundBrushTransition" Duration="0:0:0.083" />
365+
365366
<Style BasedOn="{StaticResource DefaultSegmentedItemStyle}"
366367
TargetType="local:SegmentedItem" />
367368

@@ -374,6 +375,7 @@
374375
<Thickness x:Key="MiddleItemHoverMargin">1, 3, 1, 3</Thickness>
375376
<Thickness x:Key="RightItemHoverMargin">1, 3, 3, 3</Thickness>
376377
<Thickness x:Key="ButtonItemPadding">11</Thickness>
378+
377379
<Style x:Key="DefaultSegmentedItemStyle"
378380
TargetType="local:SegmentedItem">
379381
<Style.Setters>
@@ -400,11 +402,9 @@
400402
BorderBrush="{TemplateBinding BorderBrush}"
401403
BorderThickness="{TemplateBinding BorderThickness}"
402404
Control.IsTemplateFocusTarget="True"
403-
CornerRadius="{TemplateBinding CornerRadius}">
404-
<win:Grid.BackgroundTransition>
405-
<win:BrushTransition Duration="0:0:0.083" />
406-
</win:Grid.BackgroundTransition>
407-
<VisualStateManager.VisualStateGroups>
405+
CornerRadius="{TemplateBinding CornerRadius}"
406+
BackgroundTransition="{ThemeResource SegmentedItemBackgroundBrushTransition}">
407+
<VisualStateManager.VisualStateGroups>
408408
<VisualStateGroup x:Name="SegmentedIconPositionStates">
409409
<VisualState x:Name="IconOnLeft" />
410410
<VisualState x:Name="IconOnly">
@@ -615,10 +615,8 @@
615615
Margin="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Converter={StaticResource MarginConverter}}"
616616
Background="Transparent"
617617
CornerRadius="{TemplateBinding CornerRadius}"
618-
RenderTransformOrigin="0.5, 0.5">
619-
<win:Border.BackgroundTransition>
620-
<win:BrushTransition Duration="0:0:0.083" />
621-
</win:Border.BackgroundTransition>
618+
RenderTransformOrigin="0.5, 0.5"
619+
BackgroundTransition="{ThemeResource SegmentedItemBackgroundBrushTransition}">
622620
<Border.RenderTransform>
623621
<CompositeTransform />
624622
</Border.RenderTransform>
@@ -926,10 +924,8 @@
926924
Background="{TemplateBinding Background}"
927925
BackgroundSizing="{TemplateBinding BackgroundSizing}"
928926
Control.IsTemplateFocusTarget="True"
929-
CornerRadius="{TemplateBinding CornerRadius}">
930-
<win:Grid.BackgroundTransition>
931-
<win:BrushTransition Duration="0:0:0.083" />
932-
</win:Grid.BackgroundTransition>
927+
CornerRadius="{TemplateBinding CornerRadius}"
928+
BackgroundTransition="{ThemeResource SegmentedItemBackgroundBrushTransition}">
933929
<VisualStateManager.VisualStateGroups>
934930
<VisualStateGroup x:Name="SegmentedIconPositionStates">
935931
<VisualState x:Name="IconOnLeft" />

0 commit comments

Comments
 (0)