|
5 | 5 | xmlns:local="using:Files.App.Controls"
|
6 | 6 | xmlns:primitives="using:Microsoft.UI.Xaml.Controls.Primitives">
|
7 | 7 |
|
| 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 | + |
8 | 20 | <x:Double x:Key="OmnibarDefaultHeight">38</x:Double>
|
9 | 21 | <x:Double x:Key="OmnibarModeDefaultHeight">34</x:Double>
|
10 | 22 | <x:Double x:Key="OmnibarModeDefaultClickAreaWidth">46</x:Double>
|
|
139 | 151 | CornerRadius="{TemplateBinding CornerRadius}"
|
140 | 152 | ToolTipService.ToolTip="{Binding ModeName, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}">
|
141 | 153 | <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}" /> |
144 | 156 | </Button.Resources>
|
145 | 157 |
|
146 | 158 | <Grid>
|
|
370 | 382 | IsTabStop="False"
|
371 | 383 | Visibility="Collapsed">
|
372 | 384 | <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}" /> |
375 | 387 | </Button.Resources>
|
376 | 388 | </Button>
|
377 | 389 | </Grid>
|
|
411 | 423 | <VisualState.Setters>
|
412 | 424 | <Setter Target="PlaceholderTextContentPresenter.Foreground" Value="{Binding PlaceholderForeground, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={ThemeResource TextControlPlaceholderForegroundFocused}}" />
|
413 | 425 | <Setter Target="BorderElement.Background" Value="{ThemeResource TextControlBackgroundFocused}" />
|
414 |
| - <Setter Target="BorderElement.BorderBrush" Value="{ThemeResource AccentFillColorDefaultBrush}" /> |
| 426 | + <Setter Target="BorderElement.BorderBrush" Value="{ThemeResource OmnibarTextBoxFocusedBorderBrush}" /> |
415 | 427 | <Setter Target="BorderElement.BorderThickness" Value="{ThemeResource OmnibarBorderThicknessFocused}" />
|
416 | 428 | <Setter Target="BorderElement.Margin" Value="{StaticResource OmnibarBorderMarginUnfocused}" />
|
417 | 429 | <Setter Target="ContentElement.Foreground" Value="{ThemeResource TextControlForegroundFocused}" />
|
|
0 commit comments