Skip to content

Commit aee8e6e

Browse files
0x5bfa0x5bfa
committed
Update
1 parent 02fcefa commit aee8e6e

File tree

2 files changed

+25
-22
lines changed

2 files changed

+25
-22
lines changed

‎src/Files.App.Controls/BreadcrumbBar/BreadcrumbBar.xaml‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,21 @@
55
xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
66
xmlns:local="using:Files.App.Controls">
77

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+
823
<x:Double x:Key="BreadcrumbBarHeight">34</x:Double>
924
<x:Double x:Key="BreadcrumbBarMinWidth">120</x:Double>
1025
<x:Double x:Key="BreadcrumbBarEllipsisFontSize">16</x:Double>
@@ -131,10 +146,6 @@
131146
CornerRadius="{TemplateBinding CornerRadius}"
132147
ToolTipService.ToolTip="{TemplateBinding ItemToolTip}"
133148
UseSystemFocusVisuals="True">
134-
<Button.Resources>
135-
<SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="{ThemeResource SubtleFillColorSecondaryBrush}" />
136-
<SolidColorBrush x:Key="ButtonBackgroundPressed" Color="{ThemeResource SubtleFillColorTertiaryBrush}" />
137-
</Button.Resources>
138149

139150
<FlyoutBase.AttachedFlyout>
140151
<MenuFlyout
@@ -180,13 +191,8 @@
180191
BorderBrush="{TemplateBinding BorderBrush}"
181192
BorderThickness="{TemplateBinding BorderThickness}"
182193
CornerRadius="{StaticResource BreadcrumbBarChevronCornerRaduis}"
183-
Style="{StaticResource BreadcrumbBarItemChevronButtonStyle}"
184194
ToolTipService.ToolTip="{TemplateBinding ChevronToolTip}"
185195
UseSystemFocusVisuals="True">
186-
<Button.Resources>
187-
<SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="{ThemeResource SubtleFillColorSecondaryBrush}" />
188-
<SolidColorBrush x:Key="ButtonBackgroundPressed" Color="{ThemeResource SubtleFillColorTertiaryBrush}" />
189-
</Button.Resources>
190196

191197
<FlyoutBase.AttachedFlyout>
192198
<MenuFlyout
@@ -273,7 +279,7 @@
273279
</Style>
274280

275281
<Style
276-
x:Key="BreadcrumbBarItemChevronButtonStyle"
282+
x:Key="BreadcrumbBarButtonStyle"
277283
BasedOn="{StaticResource DefaultButtonStyle}"
278284
TargetType="Button">
279285
<Setter Property="Template">
@@ -303,7 +309,7 @@
303309
<VisualState x:Name="PointerOver">
304310
<Storyboard>
305311
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
306-
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonBackgroundPointerOver}" />
312+
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource BreadcrumbBarButtonBackgroundPointerOver}" />
307313
</ObjectAnimationUsingKeyFrames>
308314
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="BorderBrush">
309315
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonBorderBrushPointerOver}" />
@@ -316,7 +322,7 @@
316322
<VisualState x:Name="Pressed">
317323
<Storyboard>
318324
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
319-
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonBackgroundPressed}" />
325+
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource BreadcrumbBarButtonBackgroundPressed}" />
320326
</ObjectAnimationUsingKeyFrames>
321327
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="BorderBrush">
322328
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonBorderBrushPressed}" />

‎src/Files.App.Controls/Omnibar/Omnibar.xaml‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,18 @@
88
<ResourceDictionary.ThemeDictionaries>
99
<ResourceDictionary x:Key="Default">
1010
<StaticResource x:Key="OmnibarTextBoxFocusedBorderBrush" ResourceKey="AccentFillColorDefaultBrush" />
11+
<StaticResource x:Key="ButtonBackgroundPointerOver" ResourceKey="SubtleFillColorSecondaryBrush" />
12+
<StaticResource x:Key="ButtonBackgroundPressed" ResourceKey="SubtleFillColorTertiaryBrush" />
1113
</ResourceDictionary>
1214
<ResourceDictionary x:Key="Light">
1315
<StaticResource x:Key="OmnibarTextBoxFocusedBorderBrush" ResourceKey="AccentFillColorDefaultBrush" />
16+
<StaticResource x:Key="ButtonBackgroundPointerOver" ResourceKey="SubtleFillColorSecondaryBrush" />
17+
<StaticResource x:Key="ButtonBackgroundPressed" ResourceKey="SubtleFillColorTertiaryBrush" />
1418
</ResourceDictionary>
1519
<ResourceDictionary x:Key="HighContrast">
1620
<StaticResource x:Key="OmnibarTextBoxFocusedBorderBrush" ResourceKey="SystemAccentColorLight2" />
21+
<StaticResource x:Key="ButtonBackgroundPointerOver" ResourceKey="SystemColorHighlightTextColorBrush" />
22+
<StaticResource x:Key="ButtonBackgroundPressed" ResourceKey="SystemColorHighlightTextColorBrush" />
1723
</ResourceDictionary>
1824
</ResourceDictionary.ThemeDictionaries>
1925

@@ -150,10 +156,6 @@
150156
BorderThickness="0"
151157
CornerRadius="{TemplateBinding CornerRadius}"
152158
ToolTipService.ToolTip="{Binding ModeName, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}">
153-
<Button.Resources>
154-
<SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="{ThemeResource SubtleFillColorSecondaryBrush}" />
155-
<SolidColorBrush x:Key="ButtonBackgroundPressed" Color="{ThemeResource SubtleFillColorTertiaryBrush}" />
156-
</Button.Resources>
157159

158160
<Grid>
159161
<ContentPresenter
@@ -380,12 +382,7 @@
380382
FontSize="{StaticResource TextBoxIconFontSize}"
381383
Foreground="{ThemeResource TextControlButtonForeground}"
382384
IsTabStop="False"
383-
Visibility="Collapsed">
384-
<Button.Resources>
385-
<SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="{ThemeResource SubtleFillColorSecondaryBrush}" />
386-
<SolidColorBrush x:Key="ButtonBackgroundPressed" Color="{ThemeResource SubtleFillColorTertiaryBrush}" />
387-
</Button.Resources>
388-
</Button>
385+
Visibility="Collapsed" />
389386
</Grid>
390387

391388
<!-- Description -->

0 commit comments

Comments
 (0)