Skip to content

Commit 342284e

Browse files
committed
Color tweaks
1 parent e2fd577 commit 342284e

File tree

1 file changed

+23
-4
lines changed

1 file changed

+23
-4
lines changed

components/SegmentedControl/src/SegmentedItem/SegmentedItem.xaml

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,10 @@
4848
<StaticResource x:Key="SegmentedPillBackgroundPressed"
4949
ResourceKey="AccentFillColorTertiaryBrush" />
5050
<StaticResource x:Key="SegmentedPillBackgroundDisabled"
51-
ResourceKey="AccentFillColorDefaultBrush" />
51+
ResourceKey="AccentFillColorDisabledBrush" />
5252

5353
<Thickness x:Key="SegmentedItemBorderThickness">1</Thickness>
54+
<x:Double x:Key="SegmentedItemDisabledOpacity">0.55</x:Double>
5455

5556
<!-- PillSegmentedStyle -->
5657
<!-- Background -->
@@ -133,9 +134,10 @@
133134
<StaticResource x:Key="SegmentedPillBackgroundPressed"
134135
ResourceKey="AccentFillColorTertiaryBrush" />
135136
<StaticResource x:Key="SegmentedPillBackgroundDisabled"
136-
ResourceKey="AccentFillColorDefaultBrush" />
137+
ResourceKey="AccentFillColorDisabledBrush" />
137138

138139
<Thickness x:Key="SegmentedItemBorderThickness">1</Thickness>
140+
<x:Double x:Key="SegmentedItemDisabledOpacity">0.55</x:Double>
139141

140142
<!-- PillSegmentedStyle -->
141143
<!-- Background -->
@@ -217,9 +219,10 @@
217219
<StaticResource x:Key="SegmentedPillBackgroundPressed"
218220
ResourceKey="AccentFillColorTertiaryBrush" />
219221
<StaticResource x:Key="SegmentedPillBackgroundDisabled"
220-
ResourceKey="AccentFillColorDefaultBrush" />
222+
ResourceKey="AccentFillColorDisabledBrush" />
221223

222224
<Thickness x:Key="SegmentedItemBorderThickness">1</Thickness>
225+
<x:Double x:Key="SegmentedItemDisabledOpacity">0.55</x:Double>
223226

224227
<!-- PillSegmentedStyle -->
225228
<!-- Background -->
@@ -379,6 +382,12 @@
379382
KeyTime="{StaticResource ComboBoxItemScaleAnimationDuration}"
380383
Value="1" />
381384
</DoubleAnimationUsingKeyFrames>
385+
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Pill"
386+
Storyboard.TargetProperty="Fill">
387+
<DiscreteObjectKeyFrame KeyTime="0"
388+
Value="{ThemeResource SegmentedPillBackground}" />
389+
</ObjectAnimationUsingKeyFrames>
390+
382391
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Root"
383392
Storyboard.TargetProperty="Background">
384393
<DiscreteObjectKeyFrame KeyTime="0"
@@ -415,6 +424,11 @@
415424
KeyTime="{StaticResource ComboBoxItemScaleAnimationDuration}"
416425
Value="1" />
417426
</DoubleAnimationUsingKeyFrames>
427+
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Pill"
428+
Storyboard.TargetProperty="Fill">
429+
<DiscreteObjectKeyFrame KeyTime="0"
430+
Value="{ThemeResource SegmentedPillBackgroundPointerOver}" />
431+
</ObjectAnimationUsingKeyFrames>
418432
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Root"
419433
Storyboard.TargetProperty="Background">
420434
<DiscreteObjectKeyFrame KeyTime="0"
@@ -451,6 +465,11 @@
451465
KeyTime="{StaticResource ComboBoxItemScaleAnimationDuration}"
452466
Value="1" />
453467
</DoubleAnimationUsingKeyFrames>
468+
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Pill"
469+
Storyboard.TargetProperty="Fill">
470+
<DiscreteObjectKeyFrame KeyTime="0"
471+
Value="{ThemeResource AccentFillColorTertiaryBrush}" />
472+
</ObjectAnimationUsingKeyFrames>
454473
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Root"
455474
Storyboard.TargetProperty="Background">
456475
<DiscreteObjectKeyFrame KeyTime="0"
@@ -480,7 +499,7 @@
480499
<Storyboard>
481500
<DoubleAnimation Storyboard.TargetName="PART_Root"
482501
Storyboard.TargetProperty="Opacity"
483-
To="{ThemeResource ListViewItemDisabledThemeOpacity}"
502+
To="{ThemeResource SegmentedItemDisabledOpacity}"
484503
Duration="0" />
485504
</Storyboard>
486505
</VisualState>

0 commit comments

Comments
 (0)