Skip to content

Commit 38c1aa3

Browse files
committed
Init
1 parent b549af2 commit 38c1aa3

File tree

2 files changed

+21
-9
lines changed

2 files changed

+21
-9
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@
132132
ToolTipService.ToolTip="{TemplateBinding ItemToolTip}"
133133
UseSystemFocusVisuals="True">
134134
<Button.Resources>
135-
<SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="{ThemeResource SubtleFillColorSecondary}" />
136-
<SolidColorBrush x:Key="ButtonBackgroundPressed" Color="{ThemeResource SubtleFillColorTertiary}" />
135+
<SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="{ThemeResource SubtleFillColorSecondaryBrush}" />
136+
<SolidColorBrush x:Key="ButtonBackgroundPressed" Color="{ThemeResource SubtleFillColorTertiaryBrush}" />
137137
</Button.Resources>
138138

139139
<FlyoutBase.AttachedFlyout>
@@ -184,8 +184,8 @@
184184
ToolTipService.ToolTip="{TemplateBinding ChevronToolTip}"
185185
UseSystemFocusVisuals="True">
186186
<Button.Resources>
187-
<SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="{ThemeResource SubtleFillColorSecondary}" />
188-
<SolidColorBrush x:Key="ButtonBackgroundPressed" Color="{ThemeResource SubtleFillColorTertiary}" />
187+
<SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="{ThemeResource SubtleFillColorSecondaryBrush}" />
188+
<SolidColorBrush x:Key="ButtonBackgroundPressed" Color="{ThemeResource SubtleFillColorTertiaryBrush}" />
189189
</Button.Resources>
190190

191191
<FlyoutBase.AttachedFlyout>

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

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

8+
<ResourceDictionary.ThemeDictionaries>
9+
<ResourceDictionary x:Key="Default">
10+
<StaticResource x:Key="OmnibarTextBoxFocusedBorderBrush" ResourceKey="AccentFillColorDefaultBrush" />
11+
</ResourceDictionary>
12+
<ResourceDictionary x:Key="Light">
13+
<StaticResource x:Key="OmnibarTextBoxFocusedBorderBrush" ResourceKey="AccentFillColorDefaultBrush" />
14+
</ResourceDictionary>
15+
<ResourceDictionary x:Key="HighContrast">
16+
<StaticResource x:Key="OmnibarTextBoxFocusedBorderBrush" ResourceKey="SystemAccentColorLight2" />
17+
</ResourceDictionary>
18+
</ResourceDictionary.ThemeDictionaries>
19+
820
<x:Double x:Key="OmnibarDefaultHeight">38</x:Double>
921
<x:Double x:Key="OmnibarModeDefaultHeight">34</x:Double>
1022
<x:Double x:Key="OmnibarModeDefaultClickAreaWidth">46</x:Double>
@@ -139,8 +151,8 @@
139151
CornerRadius="{TemplateBinding CornerRadius}"
140152
ToolTipService.ToolTip="{Binding ModeName, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}">
141153
<Button.Resources>
142-
<SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="{ThemeResource SubtleFillColorSecondary}" />
143-
<SolidColorBrush x:Key="ButtonBackgroundPressed" Color="{ThemeResource SubtleFillColorTertiary}" />
154+
<SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="{ThemeResource SubtleFillColorSecondaryBrush}" />
155+
<SolidColorBrush x:Key="ButtonBackgroundPressed" Color="{ThemeResource SubtleFillColorTertiaryBrush}" />
144156
</Button.Resources>
145157

146158
<Grid>
@@ -370,8 +382,8 @@
370382
IsTabStop="False"
371383
Visibility="Collapsed">
372384
<Button.Resources>
373-
<SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="{ThemeResource SubtleFillColorSecondary}" />
374-
<SolidColorBrush x:Key="ButtonBackgroundPressed" Color="{ThemeResource SubtleFillColorTertiary}" />
385+
<SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="{ThemeResource SubtleFillColorSecondaryBrush}" />
386+
<SolidColorBrush x:Key="ButtonBackgroundPressed" Color="{ThemeResource SubtleFillColorTertiaryBrush}" />
375387
</Button.Resources>
376388
</Button>
377389
</Grid>
@@ -411,7 +423,7 @@
411423
<VisualState.Setters>
412424
<Setter Target="PlaceholderTextContentPresenter.Foreground" Value="{Binding PlaceholderForeground, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={ThemeResource TextControlPlaceholderForegroundFocused}}" />
413425
<Setter Target="BorderElement.Background" Value="{ThemeResource TextControlBackgroundFocused}" />
414-
<Setter Target="BorderElement.BorderBrush" Value="{ThemeResource AccentFillColorDefaultBrush}" />
426+
<Setter Target="BorderElement.BorderBrush" Value="{ThemeResource OmnibarTextBoxFocusedBorderBrush}" />
415427
<Setter Target="BorderElement.BorderThickness" Value="{ThemeResource OmnibarBorderThicknessFocused}" />
416428
<Setter Target="BorderElement.Margin" Value="{StaticResource OmnibarBorderMarginUnfocused}" />
417429
<Setter Target="ContentElement.Foreground" Value="{ThemeResource TextControlForegroundFocused}" />

0 commit comments

Comments
 (0)