Skip to content

Commit 6ca26d4

Browse files
author
eriklimakc
committed
fix(CalendarView): Adjust Material CalendarView style
1 parent acfb64b commit 6ca26d4

File tree

1 file changed

+8
-38
lines changed

1 file changed

+8
-38
lines changed

src/library/Uno.Material/Styles/Controls/v2/CalendarView.xaml

+8-38
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,17 @@
3939
<Setter Property="PressedForeground"
4040
Value="{ThemeResource CalendarViewPressedForeground}" />
4141
<Setter Property="OutOfScopeForeground"
42-
Value="{ThemeResource CalendarViewOutOfScopeForeground}" />
42+
Value="{ThemeResource OnSurfaceLowBrush}" />
4343
<Setter Property="CalendarItemForeground"
4444
Value="{ThemeResource CalendarViewCalendarItemForeground}" />
4545
<Setter Property="OutOfScopeBackground"
46-
Value="{ThemeResource CalendarViewOutOfScopeBackground}" />
46+
Value="Transparent" />
4747
<Setter Property="CalendarItemBackground"
4848
Value="{ThemeResource CalendarViewCalendarItemRevealBackground}" />
4949
<Setter Property="Foreground"
50-
Value="{ThemeResource OnPrimaryBrush}" />
50+
Value="{ThemeResource OnSurfaceVariantBrush}" />
5151
<Setter Property="Background"
52-
Value="{ThemeResource PrimaryBrush}" />
52+
Value="{ThemeResource SurfaceBrush}" />
5353
<Setter Property="BorderBrush"
5454
Value="{ThemeResource SurfaceBrush}" />
5555
<Setter Property="DayItemFontFamily"
@@ -146,20 +146,8 @@
146146
<VisualStateManager.VisualStateGroups>
147147
<VisualStateGroup x:Name="CommonStates">
148148
<VisualState x:Name="Normal" />
149-
<VisualState x:Name="PointerOver">
150-
<VisualState.Setters>
151-
<Setter Target="Text.BorderBrush"
152-
Value="{ThemeResource CalendarViewNavigationButtonBorderBrushPointerOver}" />
153-
<Setter Target="Text.Foreground"
154-
Value="{ThemeResource OnPrimaryMediumBrush}" />
155-
</VisualState.Setters>
156-
</VisualState>
157-
<VisualState x:Name="Pressed">
158-
<VisualState.Setters>
159-
<Setter Target="Text.Foreground"
160-
Value="{ThemeResource OnPrimaryLowBrush}" />
161-
</VisualState.Setters>
162-
</VisualState>
149+
<VisualState x:Name="PointerOver" />
150+
<VisualState x:Name="Pressed" />
163151
<VisualState x:Name="Disabled" />
164152
</VisualStateGroup>
165153
</VisualStateManager.VisualStateGroups>
@@ -203,26 +191,8 @@
203191
<VisualStateManager.VisualStateGroups>
204192
<VisualStateGroup x:Name="CommonStates">
205193
<VisualState x:Name="Normal" />
206-
207-
<VisualState x:Name="PointerOver">
208-
<VisualState.Setters>
209-
<Setter Target="Text.BorderBrush"
210-
Value="{ThemeResource CalendarViewNavigationButtonBorderBrushPointerOver}" />
211-
<Setter Target="Text.Foreground"
212-
Value="{ThemeResource OnPrimaryMediumBrush}" />
213-
<Setter Target="DownArrowGlyph.Fill"
214-
Value="{ThemeResource OnPrimaryMediumBrush}" />
215-
</VisualState.Setters>
216-
</VisualState>
217-
218-
<VisualState x:Name="Pressed">
219-
<VisualState.Setters>
220-
<Setter Target="Text.Foreground"
221-
Value="{ThemeResource OnPrimaryLowBrush}" />
222-
<Setter Target="DownArrowGlyph.Fill"
223-
Value="{ThemeResource OnPrimaryLowBrush}" />
224-
</VisualState.Setters>
225-
</VisualState>
194+
<VisualState x:Name="PointerOver" />
195+
<VisualState x:Name="Pressed" />
226196
<VisualState x:Name="Disabled">
227197
<VisualState.Setters>
228198
<Setter Target="DownArrowGlyph.Opacity"

0 commit comments

Comments
 (0)