Skip to content

Commit 39c5777

Browse files
authored
Make CalendarViewCalendarItemBackground the same as RS3 (#189)
* add SystemControlBackgroundAltHighRevealBackgroundBrush * lift CalendarViewCalendarItemRevealBackground * move CalendarViewCalendarItemRevealBackground to difference file
1 parent b988a53 commit 39c5777

File tree

2 files changed

+23
-3
lines changed

2 files changed

+23
-3
lines changed

dev/Materials/Reveal/RevealBrush_rs1_themeresources.xaml

+12-3
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<!-- Background Brushes -->
3434
<SolidColorBrush x:Key="SystemControlBackgroundBaseLowRevealBackgroundBrush" Color="{StaticResource SystemBaseLowColor}" />
3535
<SolidColorBrush x:Key="SystemControlTransparentRevealBackgroundBrush" Color="Transparent" />
36+
<SolidColorBrush x:Key="SystemControlBackgroundAltHighRevealBackgroundBrush" Color="{StaticResource SystemAltHighColor}" />
3637
<SolidColorBrush x:Key="SystemControlHighlightAccentRevealBackgroundBrush" Color="{ThemeResource SystemAccentColor}" />
3738
<SolidColorBrush x:Key="SystemControlHighlightAccent3RevealBackgroundBrush" Color="{ThemeResource SystemAccentColor}" Opacity="0.6" />
3839
<SolidColorBrush x:Key="SystemControlHighlightAccent2RevealBackgroundBrush" Color="{ThemeResource SystemAccentColor}" Opacity="0.8" />
@@ -87,7 +88,9 @@
8788
<Thickness x:Key="ComboBoxItemRevealThemePadding">11,5,11,7</Thickness>
8889
<Thickness x:Key="ComboBoxItemRevealThemeTouchPadding">11,11,11,13</Thickness>
8990
<Thickness x:Key="ComboBoxItemRevealThemeGameControllerPadding">11,11,11,13</Thickness>
90-
91+
92+
<StaticResource x:Key="CalendarViewCalendarItemRevealBackground" ResourceKey="SystemControlBackgroundAltHighRevealBackgroundBrush" />
93+
9194
<!-- Resources for Windows.UI.Xaml.Controls.Button -->
9295
<StaticResource x:Key="ButtonRevealBackground" ResourceKey="SystemControlBackgroundBaseLowRevealBackgroundBrush" />
9396
<StaticResource x:Key="ButtonRevealBackgroundPointerOver" ResourceKey="SystemControlBackgroundBaseLowRevealBackgroundBrush" />
@@ -234,6 +237,7 @@
234237
<!-- Background Brushes -->
235238
<SolidColorBrush x:Key="SystemControlBackgroundBaseLowRevealBackgroundBrush" Color="{StaticResource SystemBaseLowColor}" />
236239
<SolidColorBrush x:Key="SystemControlTransparentRevealBackgroundBrush" Color="Transparent" />
240+
<SolidColorBrush x:Key="SystemControlBackgroundAltHighRevealBackgroundBrush" Color="{ThemeResource SystemColorButtonFaceColor}" />
237241
<SolidColorBrush x:Key="SystemControlHighlightAccentRevealBackgroundBrush" Color="{ThemeResource SystemAccentColor}" />
238242
<SolidColorBrush x:Key="SystemControlHighlightAccent3RevealBackgroundBrush" Color="{ThemeResource SystemAccentColor}" Opacity="0.6" />
239243
<SolidColorBrush x:Key="SystemControlHighlightAccent2RevealBackgroundBrush" Color="{ThemeResource SystemAccentColor}" Opacity="0.8" />
@@ -288,7 +292,9 @@
288292
<Thickness x:Key="ComboBoxItemRevealThemePadding">11,5,11,7</Thickness>
289293
<Thickness x:Key="ComboBoxItemRevealThemeTouchPadding">11,11,11,13</Thickness>
290294
<Thickness x:Key="ComboBoxItemRevealThemeGameControllerPadding">11,11,11,13</Thickness>
291-
295+
296+
<StaticResource x:Key="CalendarViewCalendarItemRevealBackground" ResourceKey="SystemControlBackgroundAltHighRevealBackgroundBrush" />
297+
292298
<!-- Resources for Windows.UI.Xaml.Controls.Button -->
293299
<StaticResource x:Key="ButtonRevealBackground" ResourceKey="SystemControlBackgroundBaseLowRevealBackgroundBrush" />
294300
<StaticResource x:Key="ButtonRevealBackgroundPointerOver" ResourceKey="SystemControlBackgroundBaseLowRevealBackgroundBrush" />
@@ -435,6 +441,7 @@
435441
<!-- Background Brushes -->
436442
<SolidColorBrush x:Key="SystemControlBackgroundBaseLowRevealBackgroundBrush" Color="{ThemeResource SystemColorButtonFaceColor}" />
437443
<SolidColorBrush x:Key="SystemControlTransparentRevealBackgroundBrush" Color="Transparent" />
444+
<SolidColorBrush x:Key="SystemControlBackgroundAltHighRevealBackgroundBrush" Color="{StaticResource SystemAltHighColor}" />
438445
<SolidColorBrush x:Key="SystemControlHighlightAccentRevealBackgroundBrush" Color="{ThemeResource SystemColorHighlightColor}" />
439446
<SolidColorBrush x:Key="SystemControlHighlightAccent3RevealBackgroundBrush" Color="{ThemeResource SystemColorHighlightColor}" />
440447
<SolidColorBrush x:Key="SystemControlHighlightAccent2RevealBackgroundBrush" Color="{ThemeResource SystemColorHighlightColor}" />
@@ -489,7 +496,9 @@
489496
<Thickness x:Key="ComboBoxItemRevealThemePadding">11,5,11,7</Thickness>
490497
<Thickness x:Key="ComboBoxItemRevealThemeTouchPadding">11,11,11,13</Thickness>
491498
<Thickness x:Key="ComboBoxItemRevealThemeGameControllerPadding">11,11,11,13</Thickness>
492-
499+
500+
<StaticResource x:Key="CalendarViewCalendarItemRevealBackground" ResourceKey="SystemControlBackgroundAltHighRevealBackgroundBrush" />
501+
493502
<!-- Resources for Windows.UI.Xaml.Controls.Button -->
494503
<StaticResource x:Key="ButtonRevealBackground" ResourceKey="SystemControlBackgroundBaseLowRevealBackgroundBrush" />
495504
<StaticResource x:Key="ButtonRevealBackgroundPointerOver" ResourceKey="SystemControlBackgroundBaseLowRevealBackgroundBrush" />

dev/Materials/Reveal/RevealBrush_rs2_themeresources.xaml

+11
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,11 @@
5656
TargetTheme="Dark"
5757
Color="Transparent"
5858
FallbackColor="Transparent"/>
59+
<local:RevealBackgroundBrush
60+
x:Key="SystemControlBackgroundAltHighRevealBackgroundBrush"
61+
TargetTheme="Dark"
62+
Color="{StaticResource SystemAltHighColor}"
63+
FallbackColor="{StaticResource SystemAltHighColor}" />
5964
<local:RevealBackgroundBrush
6065
x:Key="SystemControlHighlightAccentRevealBackgroundBrush"
6166
TargetTheme="Dark"
@@ -400,6 +405,11 @@
400405
TargetTheme="Light"
401406
Color="Transparent"
402407
FallbackColor="Transparent"/>
408+
<local:RevealBackgroundBrush
409+
x:Key="SystemControlBackgroundAltHighRevealBackgroundBrush"
410+
TargetTheme="Light"
411+
Color="{StaticResource SystemAltHighColor}"
412+
FallbackColor="{StaticResource SystemAltHighColor}" />
403413
<local:RevealBackgroundBrush
404414
x:Key="SystemControlHighlightAccentRevealBackgroundBrush"
405415
TargetTheme="Light"
@@ -736,6 +746,7 @@
736746
<!-- Background Brushes -->
737747
<SolidColorBrush x:Key="SystemControlBackgroundBaseLowRevealBackgroundBrush" Color="{ThemeResource SystemColorButtonFaceColor}" />
738748
<SolidColorBrush x:Key="SystemControlTransparentRevealBackgroundBrush" Color="Transparent" />
749+
<SolidColorBrush x:Key="SystemControlBackgroundAltHighRevealBackgroundBrush" Color="{ThemeResource SystemColorButtonFaceColor}" />
739750
<SolidColorBrush x:Key="SystemControlHighlightAccentRevealBackgroundBrush" Color="{ThemeResource SystemColorHighlightColor}" />
740751
<SolidColorBrush x:Key="SystemControlHighlightAccent3RevealBackgroundBrush" Color="{ThemeResource SystemColorHighlightColor}" />
741752
<SolidColorBrush x:Key="SystemControlHighlightAccent2RevealBackgroundBrush" Color="{ThemeResource SystemColorHighlightColor}" />

0 commit comments

Comments
 (0)