|
5 | 5 | xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
|
6 | 6 | xmlns:local="using:Files.App.Controls">
|
7 | 7 |
|
| 8 | + <ResourceDictionary.ThemeDictionaries> |
| 9 | + <ResourceDictionary x:Key="Default"> |
| 10 | + <StaticResource x:Key="ButtonBackgroundPointerOver" ResourceKey="SubtleFillColorSecondaryBrush" /> |
| 11 | + <StaticResource x:Key="ButtonBackgroundPressed" ResourceKey="SubtleFillColorTertiaryBrush" /> |
| 12 | + </ResourceDictionary> |
| 13 | + <ResourceDictionary x:Key="Light"> |
| 14 | + <StaticResource x:Key="ButtonBackgroundPointerOver" ResourceKey="SubtleFillColorSecondaryBrush" /> |
| 15 | + <StaticResource x:Key="ButtonBackgroundPressed" ResourceKey="SubtleFillColorTertiaryBrush" /> |
| 16 | + </ResourceDictionary> |
| 17 | + <ResourceDictionary x:Key="HighContrast"> |
| 18 | + <StaticResource x:Key="ButtonBackgroundPointerOver" ResourceKey="SystemColorHighlightTextColorBrush" /> |
| 19 | + <StaticResource x:Key="ButtonBackgroundPressed" ResourceKey="SystemColorHighlightTextColorBrush" /> |
| 20 | + </ResourceDictionary> |
| 21 | + </ResourceDictionary.ThemeDictionaries> |
| 22 | + |
8 | 23 | <x:Double x:Key="BreadcrumbBarHeight">34</x:Double>
|
9 | 24 | <x:Double x:Key="BreadcrumbBarMinWidth">120</x:Double>
|
10 | 25 | <x:Double x:Key="BreadcrumbBarEllipsisFontSize">16</x:Double>
|
|
131 | 146 | CornerRadius="{TemplateBinding CornerRadius}"
|
132 | 147 | ToolTipService.ToolTip="{TemplateBinding ItemToolTip}"
|
133 | 148 | UseSystemFocusVisuals="True">
|
134 |
| - <Button.Resources> |
135 |
| - <SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="{ThemeResource SubtleFillColorSecondaryBrush}" /> |
136 |
| - <SolidColorBrush x:Key="ButtonBackgroundPressed" Color="{ThemeResource SubtleFillColorTertiaryBrush}" /> |
137 |
| - </Button.Resources> |
138 | 149 |
|
139 | 150 | <FlyoutBase.AttachedFlyout>
|
140 | 151 | <MenuFlyout
|
|
180 | 191 | BorderBrush="{TemplateBinding BorderBrush}"
|
181 | 192 | BorderThickness="{TemplateBinding BorderThickness}"
|
182 | 193 | CornerRadius="{StaticResource BreadcrumbBarChevronCornerRaduis}"
|
183 |
| - Style="{StaticResource BreadcrumbBarItemChevronButtonStyle}" |
184 | 194 | ToolTipService.ToolTip="{TemplateBinding ChevronToolTip}"
|
185 | 195 | UseSystemFocusVisuals="True">
|
186 |
| - <Button.Resources> |
187 |
| - <SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="{ThemeResource SubtleFillColorSecondaryBrush}" /> |
188 |
| - <SolidColorBrush x:Key="ButtonBackgroundPressed" Color="{ThemeResource SubtleFillColorTertiaryBrush}" /> |
189 |
| - </Button.Resources> |
190 | 196 |
|
191 | 197 | <FlyoutBase.AttachedFlyout>
|
192 | 198 | <MenuFlyout
|
|
273 | 279 | </Style>
|
274 | 280 |
|
275 | 281 | <Style
|
276 |
| - x:Key="BreadcrumbBarItemChevronButtonStyle" |
| 282 | + x:Key="BreadcrumbBarButtonStyle" |
277 | 283 | BasedOn="{StaticResource DefaultButtonStyle}"
|
278 | 284 | TargetType="Button">
|
279 | 285 | <Setter Property="Template">
|
|
303 | 309 | <VisualState x:Name="PointerOver">
|
304 | 310 | <Storyboard>
|
305 | 311 | <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
|
306 |
| - <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonBackgroundPointerOver}" /> |
| 312 | + <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource BreadcrumbBarButtonBackgroundPointerOver}" /> |
307 | 313 | </ObjectAnimationUsingKeyFrames>
|
308 | 314 | <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="BorderBrush">
|
309 | 315 | <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonBorderBrushPointerOver}" />
|
|
316 | 322 | <VisualState x:Name="Pressed">
|
317 | 323 | <Storyboard>
|
318 | 324 | <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
|
319 |
| - <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonBackgroundPressed}" /> |
| 325 | + <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource BreadcrumbBarButtonBackgroundPressed}" /> |
320 | 326 | </ObjectAnimationUsingKeyFrames>
|
321 | 327 | <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="BorderBrush">
|
322 | 328 | <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonBorderBrushPressed}" />
|
|
0 commit comments