|
48 | 48 | <StaticResource x:Key="SegmentedPillBackgroundPressed" |
49 | 49 | ResourceKey="AccentFillColorTertiaryBrush" /> |
50 | 50 | <StaticResource x:Key="SegmentedPillBackgroundDisabled" |
51 | | - ResourceKey="AccentFillColorDefaultBrush" /> |
| 51 | + ResourceKey="AccentFillColorDisabledBrush" /> |
52 | 52 |
|
53 | 53 | <Thickness x:Key="SegmentedItemBorderThickness">1</Thickness> |
| 54 | + <x:Double x:Key="SegmentedItemDisabledOpacity">0.55</x:Double> |
54 | 55 |
|
55 | 56 | <!-- PillSegmentedStyle --> |
56 | 57 | <!-- Background --> |
|
133 | 134 | <StaticResource x:Key="SegmentedPillBackgroundPressed" |
134 | 135 | ResourceKey="AccentFillColorTertiaryBrush" /> |
135 | 136 | <StaticResource x:Key="SegmentedPillBackgroundDisabled" |
136 | | - ResourceKey="AccentFillColorDefaultBrush" /> |
| 137 | + ResourceKey="AccentFillColorDisabledBrush" /> |
137 | 138 |
|
138 | 139 | <Thickness x:Key="SegmentedItemBorderThickness">1</Thickness> |
| 140 | + <x:Double x:Key="SegmentedItemDisabledOpacity">0.55</x:Double> |
139 | 141 |
|
140 | 142 | <!-- PillSegmentedStyle --> |
141 | 143 | <!-- Background --> |
|
217 | 219 | <StaticResource x:Key="SegmentedPillBackgroundPressed" |
218 | 220 | ResourceKey="AccentFillColorTertiaryBrush" /> |
219 | 221 | <StaticResource x:Key="SegmentedPillBackgroundDisabled" |
220 | | - ResourceKey="AccentFillColorDefaultBrush" /> |
| 222 | + ResourceKey="AccentFillColorDisabledBrush" /> |
221 | 223 |
|
222 | 224 | <Thickness x:Key="SegmentedItemBorderThickness">1</Thickness> |
| 225 | + <x:Double x:Key="SegmentedItemDisabledOpacity">0.55</x:Double> |
223 | 226 |
|
224 | 227 | <!-- PillSegmentedStyle --> |
225 | 228 | <!-- Background --> |
|
379 | 382 | KeyTime="{StaticResource ComboBoxItemScaleAnimationDuration}" |
380 | 383 | Value="1" /> |
381 | 384 | </DoubleAnimationUsingKeyFrames> |
| 385 | + <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Pill" |
| 386 | + Storyboard.TargetProperty="Fill"> |
| 387 | + <DiscreteObjectKeyFrame KeyTime="0" |
| 388 | + Value="{ThemeResource SegmentedPillBackground}" /> |
| 389 | + </ObjectAnimationUsingKeyFrames> |
| 390 | + |
382 | 391 | <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Root" |
383 | 392 | Storyboard.TargetProperty="Background"> |
384 | 393 | <DiscreteObjectKeyFrame KeyTime="0" |
|
415 | 424 | KeyTime="{StaticResource ComboBoxItemScaleAnimationDuration}" |
416 | 425 | Value="1" /> |
417 | 426 | </DoubleAnimationUsingKeyFrames> |
| 427 | + <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Pill" |
| 428 | + Storyboard.TargetProperty="Fill"> |
| 429 | + <DiscreteObjectKeyFrame KeyTime="0" |
| 430 | + Value="{ThemeResource SegmentedPillBackgroundPointerOver}" /> |
| 431 | + </ObjectAnimationUsingKeyFrames> |
418 | 432 | <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Root" |
419 | 433 | Storyboard.TargetProperty="Background"> |
420 | 434 | <DiscreteObjectKeyFrame KeyTime="0" |
|
451 | 465 | KeyTime="{StaticResource ComboBoxItemScaleAnimationDuration}" |
452 | 466 | Value="1" /> |
453 | 467 | </DoubleAnimationUsingKeyFrames> |
| 468 | + <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Pill" |
| 469 | + Storyboard.TargetProperty="Fill"> |
| 470 | + <DiscreteObjectKeyFrame KeyTime="0" |
| 471 | + Value="{ThemeResource AccentFillColorTertiaryBrush}" /> |
| 472 | + </ObjectAnimationUsingKeyFrames> |
454 | 473 | <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Root" |
455 | 474 | Storyboard.TargetProperty="Background"> |
456 | 475 | <DiscreteObjectKeyFrame KeyTime="0" |
|
480 | 499 | <Storyboard> |
481 | 500 | <DoubleAnimation Storyboard.TargetName="PART_Root" |
482 | 501 | Storyboard.TargetProperty="Opacity" |
483 | | - To="{ThemeResource ListViewItemDisabledThemeOpacity}" |
| 502 | + To="{ThemeResource SegmentedItemDisabledOpacity}" |
484 | 503 | Duration="0" /> |
485 | 504 | </Storyboard> |
486 | 505 | </VisualState> |
|
0 commit comments