Skip to content

Commit 4acb20d

Browse files
KinnaraKinnara
authored
1 parent c73c9b8 commit 4acb20d

File tree

4 files changed

+42
-25
lines changed

4 files changed

+42
-25
lines changed

‎ModernWpf.MahApps/Styles/Controls.FlipView.xaml‎

Lines changed: 33 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
<ResourceDictionary
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+
xmlns:sys="clr-namespace:System;assembly=mscorlib"
45
xmlns:ui="http://schemas.modernwpf.com/2019"
56
xmlns:Controls="http://metro.mahapps.com/winfx/xaml/controls">
67

8+
<sys:Double x:Key="FlipViewButtonFontSize">8</sys:Double>
9+
<sys:Double x:Key="FlipViewButtonFontSizePointerOver">9</sys:Double>
10+
<sys:Double x:Key="FlipViewButtonFontSizePressed">7</sys:Double>
11+
712
<Style x:Key="DefaultFlipViewStyle" TargetType="Controls:FlipView">
813
<Setter Property="Background" Value="{DynamicResource FlipViewBackground}" />
914
<Setter Property="BorderThickness" Value="0" />
@@ -71,7 +76,7 @@
7176
<ui:FontIconFallback
7277
x:Name="Arrow"
7378
FontFamily="{DynamicResource SymbolThemeFontFamily}"
74-
FontSize="12"
79+
FontSize="{DynamicResource FlipViewButtonFontSize}"
7580
Foreground="{DynamicResource FlipViewNextPreviousArrowForeground}"
7681
Data="{StaticResource CaretRight}"
7782
HorizontalAlignment="Center"
@@ -83,11 +88,13 @@
8388
<Setter TargetName="Root" Property="Background" Value="{DynamicResource FlipViewNextPreviousButtonBackgroundPointerOver}" />
8489
<Setter TargetName="Root" Property="BorderBrush" Value="{DynamicResource FlipViewNextPreviousButtonBorderBrushPointerOver}" />
8590
<Setter TargetName="Arrow" Property="Foreground" Value="{DynamicResource FlipViewNextPreviousArrowForegroundPointerOver}" />
91+
<Setter TargetName="Arrow" Property="FontSize" Value="{StaticResource FlipViewButtonFontSizePointerOver}" />
8692
</Trigger>
8793
<Trigger Property="IsPressed" Value="True">
8894
<Setter TargetName="Root" Property="Background" Value="{DynamicResource FlipViewNextPreviousButtonBackgroundPressed}" />
8995
<Setter TargetName="Root" Property="BorderBrush" Value="{DynamicResource FlipViewNextPreviousButtonBorderBrushPressed}" />
9096
<Setter TargetName="Arrow" Property="Foreground" Value="{DynamicResource FlipViewNextPreviousArrowForegroundPressed}" />
97+
<Setter TargetName="Arrow" Property="FontSize" Value="{StaticResource FlipViewButtonFontSizePressed}" />
9198
</Trigger>
9299
</ControlTemplate.Triggers>
93100
</ControlTemplate>
@@ -101,7 +108,7 @@
101108
<ui:FontIconFallback
102109
x:Name="Arrow"
103110
FontFamily="{DynamicResource SymbolThemeFontFamily}"
104-
FontSize="12"
111+
FontSize="{DynamicResource FlipViewButtonFontSize}"
105112
Foreground="{DynamicResource FlipViewNextPreviousArrowForeground}"
106113
Data="{StaticResource CaretLeft}"
107114
HorizontalAlignment="Center"
@@ -113,11 +120,13 @@
113120
<Setter TargetName="Root" Property="Background" Value="{DynamicResource FlipViewNextPreviousButtonBackgroundPointerOver}" />
114121
<Setter TargetName="Root" Property="BorderBrush" Value="{DynamicResource FlipViewNextPreviousButtonBorderBrushPointerOver}" />
115122
<Setter TargetName="Arrow" Property="Foreground" Value="{DynamicResource FlipViewNextPreviousArrowForegroundPointerOver}" />
123+
<Setter TargetName="Arrow" Property="FontSize" Value="{StaticResource FlipViewButtonFontSizePointerOver}" />
116124
</Trigger>
117125
<Trigger Property="IsPressed" Value="True">
118126
<Setter TargetName="Root" Property="Background" Value="{DynamicResource FlipViewNextPreviousButtonBackgroundPressed}" />
119127
<Setter TargetName="Root" Property="BorderBrush" Value="{DynamicResource FlipViewNextPreviousButtonBorderBrushPressed}" />
120128
<Setter TargetName="Arrow" Property="Foreground" Value="{DynamicResource FlipViewNextPreviousArrowForegroundPressed}" />
129+
<Setter TargetName="Arrow" Property="FontSize" Value="{StaticResource FlipViewButtonFontSizePressed}" />
121130
</Trigger>
122131
</ControlTemplate.Triggers>
123132
</ControlTemplate>
@@ -131,7 +140,7 @@
131140
<ui:FontIconFallback
132141
x:Name="Arrow"
133142
FontFamily="{DynamicResource SymbolThemeFontFamily}"
134-
FontSize="12"
143+
FontSize="{DynamicResource FlipViewButtonFontSize}"
135144
Foreground="{DynamicResource FlipViewNextPreviousArrowForeground}"
136145
Data="{StaticResource CaretDown}"
137146
HorizontalAlignment="Center"
@@ -143,11 +152,13 @@
143152
<Setter TargetName="Root" Property="Background" Value="{DynamicResource FlipViewNextPreviousButtonBackgroundPointerOver}" />
144153
<Setter TargetName="Root" Property="BorderBrush" Value="{DynamicResource FlipViewNextPreviousButtonBorderBrushPointerOver}" />
145154
<Setter TargetName="Arrow" Property="Foreground" Value="{DynamicResource FlipViewNextPreviousArrowForegroundPointerOver}" />
155+
<Setter TargetName="Arrow" Property="FontSize" Value="{StaticResource FlipViewButtonFontSizePointerOver}" />
146156
</Trigger>
147157
<Trigger Property="IsPressed" Value="True">
148158
<Setter TargetName="Root" Property="Background" Value="{DynamicResource FlipViewNextPreviousButtonBackgroundPressed}" />
149159
<Setter TargetName="Root" Property="BorderBrush" Value="{DynamicResource FlipViewNextPreviousButtonBorderBrushPressed}" />
150160
<Setter TargetName="Arrow" Property="Foreground" Value="{DynamicResource FlipViewNextPreviousArrowForegroundPressed}" />
161+
<Setter TargetName="Arrow" Property="FontSize" Value="{StaticResource FlipViewButtonFontSizePressed}" />
151162
</Trigger>
152163
</ControlTemplate.Triggers>
153164
</ControlTemplate>
@@ -161,7 +172,7 @@
161172
<ui:FontIconFallback
162173
x:Name="Arrow"
163174
FontFamily="{DynamicResource SymbolThemeFontFamily}"
164-
FontSize="12"
175+
FontSize="{DynamicResource FlipViewButtonFontSize}"
165176
Foreground="{DynamicResource FlipViewNextPreviousArrowForeground}"
166177
Data="{StaticResource CaretUp}"
167178
HorizontalAlignment="Center"
@@ -173,11 +184,13 @@
173184
<Setter TargetName="Root" Property="Background" Value="{DynamicResource FlipViewNextPreviousButtonBackgroundPointerOver}" />
174185
<Setter TargetName="Root" Property="BorderBrush" Value="{DynamicResource FlipViewNextPreviousButtonBorderBrushPointerOver}" />
175186
<Setter TargetName="Arrow" Property="Foreground" Value="{DynamicResource FlipViewNextPreviousArrowForegroundPointerOver}" />
187+
<Setter TargetName="Arrow" Property="FontSize" Value="{StaticResource FlipViewButtonFontSizePointerOver}" />
176188
</Trigger>
177189
<Trigger Property="IsPressed" Value="True">
178190
<Setter TargetName="Root" Property="Background" Value="{DynamicResource FlipViewNextPreviousButtonBackgroundPressed}" />
179191
<Setter TargetName="Root" Property="BorderBrush" Value="{DynamicResource FlipViewNextPreviousButtonBorderBrushPressed}" />
180192
<Setter TargetName="Arrow" Property="Foreground" Value="{DynamicResource FlipViewNextPreviousArrowForegroundPressed}" />
193+
<Setter TargetName="Arrow" Property="FontSize" Value="{StaticResource FlipViewButtonFontSizePressed}" />
181194
</Trigger>
182195
</ControlTemplate.Triggers>
183196
</ControlTemplate>
@@ -193,9 +206,10 @@
193206
<Button
194207
x:Name="PART_BackButton"
195208
Template="{StaticResource HorizontalPreviousTemplate}"
196-
Width="20"
197-
Height="36"
198-
ui:ControlHelper.CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius, Converter={StaticResource RightCornerRadiusFilterConverter}}"
209+
Width="16"
210+
Height="38"
211+
Margin="1"
212+
ui:ControlHelper.CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}"
199213
IsTabStop="False"
200214
FocusVisualStyle="{x:Null}"
201215
HorizontalAlignment="Left"
@@ -204,9 +218,10 @@
204218
<Button
205219
x:Name="PART_ForwardButton"
206220
Template="{StaticResource HorizontalNextTemplate}"
207-
Width="20"
208-
Height="36"
209-
ui:ControlHelper.CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius, Converter={StaticResource LeftCornerRadiusFilterConverter}}"
221+
Width="16"
222+
Height="38"
223+
Margin="1"
224+
ui:ControlHelper.CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}"
210225
IsTabStop="False"
211226
FocusVisualStyle="{x:Null}"
212227
HorizontalAlignment="Right"
@@ -215,9 +230,10 @@
215230
<Button
216231
x:Name="PART_UpButton"
217232
Template="{StaticResource VerticalPreviousTemplate}"
218-
Width="36"
219-
Height="20"
220-
ui:ControlHelper.CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius, Converter={StaticResource BottomCornerRadiusFilterConverter}}"
233+
Width="38"
234+
Height="16"
235+
Margin="1"
236+
ui:ControlHelper.CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}"
221237
IsTabStop="False"
222238
FocusVisualStyle="{x:Null}"
223239
HorizontalAlignment="Center"
@@ -226,9 +242,10 @@
226242
<Button
227243
x:Name="PART_DownButton"
228244
Template="{StaticResource VerticalNextTemplate}"
229-
Width="36"
230-
Height="20"
231-
ui:ControlHelper.CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius, Converter={StaticResource TopCornerRadiusFilterConverter}}"
245+
Width="38"
246+
Height="16"
247+
Margin="1"
248+
ui:ControlHelper.CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}"
232249
IsTabStop="False"
233250
FocusVisualStyle="{x:Null}"
234251
HorizontalAlignment="Center"

‎ModernWpf/ThemeResources/Dark.xaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -913,9 +913,9 @@
913913
<!-- Resources for FlipView -->
914914
<Thickness x:Key="FlipViewButtonBorderThemeThickness">0</Thickness>
915915
<m:StaticResource x:Key="FlipViewBackground" ResourceKey="SolidBackgroundFillColorBaseBrush" />
916-
<m:StaticResource x:Key="FlipViewNextPreviousButtonBackground" ResourceKey="ControlAltFillColorQuarternaryBrush" />
917-
<m:StaticResource x:Key="FlipViewNextPreviousButtonBackgroundPointerOver" ResourceKey="ControlStrokeColorDefaultBrush" />
918-
<m:StaticResource x:Key="FlipViewNextPreviousButtonBackgroundPressed" ResourceKey="ControlAAStrokeColorDefaultBrush" />
916+
<m:StaticResource x:Key="FlipViewNextPreviousButtonBackground" ResourceKey="AcrylicInAppFillColorDefaultBrush" />
917+
<m:StaticResource x:Key="FlipViewNextPreviousButtonBackgroundPointerOver" ResourceKey="AcrylicInAppFillColorDefaultBrush" />
918+
<m:StaticResource x:Key="FlipViewNextPreviousButtonBackgroundPressed" ResourceKey="AcrylicInAppFillColorDefaultBrush" />
919919
<m:StaticResource x:Key="FlipViewNextPreviousArrowForeground" ResourceKey="ControlAAFillColorDefaultBrush" />
920920
<m:StaticResource x:Key="FlipViewNextPreviousArrowForegroundPointerOver" ResourceKey="TextFillColorSecondaryBrush" />
921921
<m:StaticResource x:Key="FlipViewNextPreviousArrowForegroundPressed" ResourceKey="TextFillColorSecondaryBrush" />

‎ModernWpf/ThemeResources/HighContrast.xaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -800,9 +800,9 @@
800800
<!-- Resources for FlipView -->
801801
<Thickness x:Key="FlipViewButtonBorderThemeThickness">0</Thickness>
802802
<m:StaticResource x:Key="FlipViewBackground" ResourceKey="SystemControlPageBackgroundListLowBrush" />
803-
<m:StaticResource x:Key="FlipViewNextPreviousButtonBackground" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
804-
<m:StaticResource x:Key="FlipViewNextPreviousButtonBackgroundPointerOver" ResourceKey="SystemControlHighlightBaseMediumBrush" />
805-
<m:StaticResource x:Key="FlipViewNextPreviousButtonBackgroundPressed" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
803+
<m:StaticResource x:Key="FlipViewNextPreviousButtonBackground" ResourceKey="AcrylicInAppFillColorDefaultBrush" />
804+
<m:StaticResource x:Key="FlipViewNextPreviousButtonBackgroundPointerOver" ResourceKey="AcrylicInAppFillColorDefaultBrush" />
805+
<m:StaticResource x:Key="FlipViewNextPreviousButtonBackgroundPressed" ResourceKey="AcrylicInAppFillColorDefaultBrush" />
806806
<m:StaticResource x:Key="FlipViewNextPreviousArrowForeground" ResourceKey="SystemControlForegroundAltMediumHighBrush" />
807807
<m:StaticResource x:Key="FlipViewNextPreviousArrowForegroundPointerOver" ResourceKey="SystemControlHighlightAltAltMediumHighBrush" />
808808
<m:StaticResource x:Key="FlipViewNextPreviousArrowForegroundPressed" ResourceKey="SystemControlHighlightAltAltMediumHighBrush" />

‎ModernWpf/ThemeResources/Light.xaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -916,9 +916,9 @@
916916
<!-- Resources for FlipView -->
917917
<Thickness x:Key="FlipViewButtonBorderThemeThickness">0</Thickness>
918918
<m:StaticResource x:Key="FlipViewBackground" ResourceKey="SolidBackgroundFillColorBaseBrush" />
919-
<m:StaticResource x:Key="FlipViewNextPreviousButtonBackground" ResourceKey="ControlAltFillColorQuarternaryBrush" />
920-
<m:StaticResource x:Key="FlipViewNextPreviousButtonBackgroundPointerOver" ResourceKey="ControlStrokeColorDefaultBrush" />
921-
<m:StaticResource x:Key="FlipViewNextPreviousButtonBackgroundPressed" ResourceKey="ControlAAStrokeColorDefaultBrush" />
919+
<m:StaticResource x:Key="FlipViewNextPreviousButtonBackground" ResourceKey="AcrylicInAppFillColorDefaultBrush" />
920+
<m:StaticResource x:Key="FlipViewNextPreviousButtonBackgroundPointerOver" ResourceKey="AcrylicInAppFillColorDefaultBrush" />
921+
<m:StaticResource x:Key="FlipViewNextPreviousButtonBackgroundPressed" ResourceKey="AcrylicInAppFillColorDefaultBrush" />
922922
<m:StaticResource x:Key="FlipViewNextPreviousArrowForeground" ResourceKey="ControlAAFillColorDefaultBrush" />
923923
<m:StaticResource x:Key="FlipViewNextPreviousArrowForegroundPointerOver" ResourceKey="TextFillColorSecondaryBrush" />
924924
<m:StaticResource x:Key="FlipViewNextPreviousArrowForegroundPressed" ResourceKey="TextFillColorSecondaryBrush" />

0 commit comments

Comments
 (0)