Skip to content

Commit 78520e6

Browse files
Fix XAML styling
1 parent fd30173 commit 78520e6

1 file changed

Lines changed: 11 additions & 10 deletions

File tree

components/Segmented/src/SegmentedItem/SegmentedItem.xaml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
1+
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
33
xmlns:local="using:CommunityToolkit.WinUI.Controls"
44
xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
@@ -361,8 +361,9 @@
361361
</ResourceDictionary.ThemeDictionaries>
362362

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

@@ -399,12 +400,12 @@
399400
<Grid x:Name="PART_Root"
400401
VerticalAlignment="{TemplateBinding VerticalAlignment}"
401402
Background="{TemplateBinding Background}"
403+
BackgroundTransition="{ThemeResource SegmentedItemBackgroundBrushTransition}"
402404
BorderBrush="{TemplateBinding BorderBrush}"
403405
BorderThickness="{TemplateBinding BorderThickness}"
404406
Control.IsTemplateFocusTarget="True"
405-
CornerRadius="{TemplateBinding CornerRadius}"
406-
BackgroundTransition="{ThemeResource SegmentedItemBackgroundBrushTransition}">
407-
<VisualStateManager.VisualStateGroups>
407+
CornerRadius="{TemplateBinding CornerRadius}">
408+
<VisualStateManager.VisualStateGroups>
408409
<VisualStateGroup x:Name="SegmentedIconPositionStates">
409410
<VisualState x:Name="IconOnLeft" />
410411
<VisualState x:Name="IconOnly">
@@ -614,9 +615,9 @@
614615
<Border x:Name="PART_Hover"
615616
Margin="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Converter={StaticResource MarginConverter}}"
616617
Background="Transparent"
618+
BackgroundTransition="{ThemeResource SegmentedItemBackgroundBrushTransition}"
617619
CornerRadius="{TemplateBinding CornerRadius}"
618-
RenderTransformOrigin="0.5, 0.5"
619-
BackgroundTransition="{ThemeResource SegmentedItemBackgroundBrushTransition}">
620+
RenderTransformOrigin="0.5, 0.5">
620621
<Border.RenderTransform>
621622
<CompositeTransform />
622623
</Border.RenderTransform>
@@ -923,9 +924,9 @@
923924
<Grid x:Name="PART_Root"
924925
Background="{TemplateBinding Background}"
925926
BackgroundSizing="{TemplateBinding BackgroundSizing}"
927+
BackgroundTransition="{ThemeResource SegmentedItemBackgroundBrushTransition}"
926928
Control.IsTemplateFocusTarget="True"
927-
CornerRadius="{TemplateBinding CornerRadius}"
928-
BackgroundTransition="{ThemeResource SegmentedItemBackgroundBrushTransition}">
929+
CornerRadius="{TemplateBinding CornerRadius}">
929930
<VisualStateManager.VisualStateGroups>
930931
<VisualStateGroup x:Name="SegmentedIconPositionStates">
931932
<VisualState x:Name="IconOnLeft" />

0 commit comments

Comments
 (0)