From eca9bd13d1f06f04f4561035c7beccbdc1fe58ae Mon Sep 17 00:00:00 2001
From: laggage <1634205628@qq.com>
Date: Wed, 29 Jan 2020 00:08:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WinPowerHelper.Wpf/MainWindow.xaml            |  30 +-
 .../Styles/Controls.ComboBox.xaml             | 269 ++++++++++++++++++
 WinPowerHelper.Wpf/Styles/Controls.xaml       |   1 +
 WinPowerHelper.Wpf/Views/TimerControl.xaml    |  34 +--
 4 files changed, 301 insertions(+), 33 deletions(-)
 create mode 100644 WinPowerHelper.Wpf/Styles/Controls.ComboBox.xaml

diff --git a/WinPowerHelper.Wpf/MainWindow.xaml b/WinPowerHelper.Wpf/MainWindow.xaml
index 0eb722e..2c4ce58 100644
--- a/WinPowerHelper.Wpf/MainWindow.xaml
+++ b/WinPowerHelper.Wpf/MainWindow.xaml
@@ -9,12 +9,13 @@
         mc:Ignorable="d"
         DataContext="{StaticResource MainViewModel}"
         Title="{Binding AppTitle}" 
-        MinHeight="240" MinWidth="420" Width="500" Height="240" 
+        MinHeight="240" MinWidth="420" Width="500" Height="250"
         MaxHeight="400" MaxWidth="680" ResizeMode="CanMinimize">
     <Window.Resources>
         <extensions:EnumDescriptionConverter x:Key="EnumDescriptionConverter" />
         <extensions:BoolNotConverter x:Key="BoolNotConverter" />
         <extensions:BoolToStringConverter x:Key="BoolToStringConverter"/>
+        
     </Window.Resources>
     <Grid>
         <Grid.RowDefinitions>
@@ -46,30 +47,39 @@
                         Command="{Binding SetIntervalToZeroCmd}">set to zero</Button>
             </WrapPanel>
         </Border>
-        <Border Grid.Row="2" Padding="12 3">
+        <Border Grid.Row="2" Padding="12 5">
             <Grid >
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="auto"/>
                     <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="*"/>
                 </Grid.ColumnDefinitions>
-                <TextBlock VerticalAlignment="Center" Text="模式:"/>
-                <ComboBox Grid.Column="1" SelectedIndex="0" 
+                <TextBlock Margin="0 0 12 0" 
+                           VerticalAlignment="Center" 
+                           FontWeight="SemiBold"
+                           Text="模式:"
+                           FontSize="13"/>
+                <ComboBox Grid.Column="1" 
+                          Margin="0 0 12 0"
+                          SelectedIndex="0" 
                           ItemsSource="{Binding PowerOptions}" 
-                          SelectedValue="{Binding SelectedPowerOption, Mode=OneWayToSource, UpdateSourceTrigger=PropertyChanged}">
+                          Style="{StaticResource ComboBox}"
+                          SelectedValue="{Binding SelectedPowerOption, Mode=OneWayToSource, UpdateSourceTrigger=PropertyChanged, FallbackValue=Sleep}" 
+                          IsEditable="False"                          
+                          ItemContainerStyle="{StaticResource ComboBoxItem.Accent}">
                     <ComboBox.ItemTemplate>
                         <DataTemplate DataType="{x:Type models:PowerOptions}" >
-                            <TextBlock Text="{Binding Path=.,  Converter={StaticResource EnumDescriptionConverter}}"></TextBlock>
+                            <TextBlock Text="{Binding Path=.,  Converter={StaticResource EnumDescriptionConverter}}"/>
                         </DataTemplate>
                     </ComboBox.ItemTemplate>
                 </ComboBox>
-            </Grid>
-        </Border>
-        <Border Grid.Row="3" Padding="12 3">
-            <Button Padding="0 3" 
+
+                <Button Padding="0 8" Grid.Column="2"
                     Command="{Binding BeginOrStopTimingCmd}"
                     CommandParameter="{Binding ElementName=timer}"
                     Style="{StaticResource Button.Square.Accent}"
                     Content="{Binding ElementName=timer, Path=IsTiming, Converter={StaticResource BoolToStringConverter}, ConverterParameter='取消;开始', FallbackValue='开始'}"/>
+            </Grid>
         </Border>
     </Grid>
 </Window>
diff --git a/WinPowerHelper.Wpf/Styles/Controls.ComboBox.xaml b/WinPowerHelper.Wpf/Styles/Controls.ComboBox.xaml
new file mode 100644
index 0000000..ed3f642
--- /dev/null
+++ b/WinPowerHelper.Wpf/Styles/Controls.ComboBox.xaml
@@ -0,0 +1,269 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:theme="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero2">
+
+    
+    <Style x:Key="ComboBoxToggleButton" TargetType="{x:Type ToggleButton}">
+        <Setter Property="OverridesDefaultStyle" Value="true"/>
+        <Setter Property="IsTabStop" Value="false"/>
+        <Setter Property="Focusable" Value="false"/>
+        <Setter Property="ClickMode" Value="Press"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ToggleButton}">
+                    <Border x:Name="templateRoot" 
+                            Background="{Binding RelativeSource={RelativeSource AncestorType=ComboBox}, Path=Background}" 
+                            BorderThickness="{TemplateBinding BorderThickness}" 
+                            BorderBrush="{Binding RelativeSource={RelativeSource AncestorType=ComboBox}, Path=BorderBrush}" 
+                            SnapsToDevicePixels="true"
+                            Padding="{TemplateBinding Padding}">
+                        <Border x:Name="splitBorder" 
+                                BorderThickness="1" 
+                                BorderBrush="Transparent" 
+                                HorizontalAlignment="Right" 
+                                Margin="0" 
+                                SnapsToDevicePixels="true" 
+                                Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">
+                            <Path x:Name="arrow" 
+                                  Data="F1 M 0,0 L 2.667,2.66665 L 5.3334,0 L 5.3334,-1.78168 L 2.6667,0.88501 L0,-1.78168 L0,0 Z" 
+                                  Fill="{DynamicResource Brushes.Gray1}" 
+                                  HorizontalAlignment="Center" 
+                                  Margin="0" 
+                                  VerticalAlignment="Center"/>
+                        </Border>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}" 
+                                           Value="true"/>
+                                <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" 
+                                           Value="false"/>
+                                <Condition Binding="{Binding IsPressed, RelativeSource={RelativeSource Self}}" 
+                                           Value="false"/>
+                                <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" 
+                                           Value="true"/>
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="Background" 
+                                    TargetName="templateRoot" 
+                                    Value="{Binding RelativeSource={RelativeSource AncestorType=ComboBox}, Path=Background}"/>
+                            <Setter Property="BorderBrush" 
+                                    TargetName="templateRoot" 
+                                    Value="{Binding RelativeSource={RelativeSource AncestorType=ComboBox}, Path=BorderBrush}"/>
+                            <Setter Property="Background" 
+                                    TargetName="splitBorder" 
+                                    Value="{Binding RelativeSource={RelativeSource AncestorType=ComboBox}, Path=Background}"/>
+                            <Setter Property="BorderBrush" 
+                                    TargetName="splitBorder" 
+                                    Value="{Binding RelativeSource={RelativeSource AncestorType=ComboBox}, Path=BorderBrush}"/>
+                        </MultiDataTrigger>
+                        <!--<Trigger Property="IsMouseOver" Value="true">
+                            <Setter Property="Fill" 
+                                    TargetName="arrow" 
+                                    Value="{StaticResource ComboBox.MouseOver.Glyph}"/>
+                        </Trigger>-->
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" 
+                                           Value="true"/>
+                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}" 
+                                           Value="false"/>
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="Background" 
+                                    TargetName="templateRoot" 
+                                    Value="{DynamicResource Brushes.Gray9}"/>
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" 
+                                           Value="true"/>
+                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}" 
+                                           Value="true"/>
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="Background" 
+                                    TargetName="templateRoot" 
+                                    Value="{DynamicResource Brushes.Gray8}"/>
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsPressed, RelativeSource={RelativeSource Self}}" 
+                                           Value="true"/>
+                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}" 
+                                           Value="false"/>
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="Background" 
+                                    TargetName="templateRoot" 
+                                    Value="{DynamicResource Brushes.Gray8}"/>
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsPressed, RelativeSource={RelativeSource Self}}" Value="true"/>
+                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}" Value="true"/>
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="Background" 
+                                    TargetName="templateRoot" 
+                                    Value="{DynamicResource Brushes.Gray8}"/>
+                        </MultiDataTrigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Fill" 
+                                    TargetName="arrow" 
+                                    Value="{DynamicResource Brushes.Controls.Disabled}"/>
+                        </Trigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" 
+                                           Value="false"/>
+                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}" 
+                                           Value="false"/>
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="Fill" 
+                                    TargetName="arrow" 
+                                    Value="{DynamicResource Brushes.Controls.Disabled}"/>
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" 
+                                           Value="false"/>
+                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}" 
+                                           Value="true"/>
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="Fill" 
+                                    TargetName="arrow" 
+                                    Value="{DynamicResource Brushes.Controls.Disabled}"/>
+                        </MultiDataTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="ComboBox" TargetType="{x:Type ComboBox}">
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource Brushes.Black}"/>
+        <Setter Property="Background" Value="{DynamicResource Brushes.White}"/>
+        <Setter Property="RenderOptions.ClearTypeHint" Value="Enabled"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="Padding" Value="6 8"/>
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <!--<Setter Property="OverridesDefaultStyle" Value="True"/>-->
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ComboBox}">
+                    <Grid x:Name="templateRoot" 
+                          SnapsToDevicePixels="true">    
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition MinWidth="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}" Width="0"/>
+                        </Grid.ColumnDefinitions>
+                        <Popup x:Name="PART_Popup" 
+                               AllowsTransparency="true" 
+                               Grid.ColumnSpan="2" 
+                               IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" 
+                               Margin="1" 
+                               Placement="Bottom" 
+                               PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}">
+                            <theme:SystemDropShadowChrome x:Name="shadow" Color="Transparent" MinWidth="{Binding ActualWidth, ElementName=templateRoot}" MaxHeight="{TemplateBinding MaxDropDownHeight}">
+                                <Border x:Name="dropDownBorder" 
+                                        Background="{DynamicResource Brushes.White}" 
+                                        BorderThickness="1" 
+                                        BorderBrush="{DynamicResource Brushes.Black}">
+                                    <ScrollViewer x:Name="DropDownScrollViewer">
+                                        <Grid x:Name="grid" 
+                                              RenderOptions.ClearTypeHint="Enabled">
+                                            <Canvas x:Name="canvas" 
+                                                    HorizontalAlignment="Left" 
+                                                    Height="0" 
+                                                    VerticalAlignment="Top" 
+                                                    Width="0">
+                                                <Rectangle x:Name="opaqueRect" 
+                                                           Fill="{Binding Background, ElementName=dropDownBorder}" 
+                                                           Height="{Binding ActualHeight, ElementName=dropDownBorder}" 
+                                                           Width="{Binding ActualWidth, ElementName=dropDownBorder}"/>
+                                            </Canvas>
+                                            <ItemsPresenter x:Name="ItemsPresenter" 
+                                                            KeyboardNavigation.DirectionalNavigation="Contained" 
+                                                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                                        </Grid>
+                                    </ScrollViewer>
+                                </Border>
+                            </theme:SystemDropShadowChrome>
+                        </Popup>
+                        <ToggleButton x:Name="toggleButton" 
+                                      Style="{StaticResource ComboBoxToggleButton}"
+                                      Background="{TemplateBinding Background}" 
+                                      BorderThickness="{TemplateBinding BorderThickness}" 
+                                      BorderBrush="{TemplateBinding BorderBrush}" 
+                                      Grid.ColumnSpan="2" 
+                                      Padding="{TemplateBinding Padding}"
+                                      IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" />
+                        <ContentPresenter x:Name="contentPresenter" 
+                                          ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" 
+                                          Content="{TemplateBinding SelectionBoxItem}" 
+                                          ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}" 
+                                          ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}" 
+                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" 
+                                          IsHitTestVisible="false" 
+                                          Margin="{TemplateBinding Padding}" 
+                                          SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" 
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>  
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="HasDropShadow" SourceName="PART_Popup" Value="true">
+                            <Setter Property="Margin" TargetName="shadow" Value="0,0,5,5"/>
+                            <Setter Property="Color" TargetName="shadow" Value="#71000000"/>
+                        </Trigger>
+                        <Trigger Property="HasItems" Value="false">
+                            <Setter Property="Height" TargetName="dropDownBorder" Value="95"/>
+                        </Trigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsGrouping" Value="true"/>
+                                <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false"/>
+                            </MultiTrigger.Conditions>
+                            <Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
+                        </MultiTrigger>
+                        <Trigger Property="ScrollViewer.CanContentScroll" SourceName="DropDownScrollViewer" Value="false">
+                            <Setter Property="Canvas.Top" TargetName="opaqueRect" Value="{Binding VerticalOffset, ElementName=DropDownScrollViewer}"/>
+                            <Setter Property="Canvas.Left" TargetName="opaqueRect" Value="{Binding HorizontalOffset, ElementName=DropDownScrollViewer}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="ComboBoxItem.Accent" TargetType="ComboBoxItem">
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
+        <Setter Property="Padding" Value="{Binding Path=Padding, RelativeSource={RelativeSource AncestorType=ComboBox}}"/>
+        <Setter Property="Background" 
+                                    Value="{DynamicResource Brushes.White}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ComboBoxItem}">
+                    <Border BorderBrush="{TemplateBinding BorderBrush}"
+                                                BorderThickness="{TemplateBinding BorderThickness}"
+                                                Background="{TemplateBinding Background}">
+                        <Grid  >
+                            <ContentControl Margin="{TemplateBinding Padding}"
+                                                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                                                Content="{TemplateBinding Content}"/>
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Background" 
+                                                        Value="{DynamicResource Brushes.Accent3}"/>
+                        </Trigger>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter Property="Background" 
+                                                        Value="{DynamicResource Brushes.Accent}"/>
+                            <Setter Property="Foreground"
+                                                        Value="{DynamicResource Brushes.White}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/WinPowerHelper.Wpf/Styles/Controls.xaml b/WinPowerHelper.Wpf/Styles/Controls.xaml
index 92c53a9..87e968e 100644
--- a/WinPowerHelper.Wpf/Styles/Controls.xaml
+++ b/WinPowerHelper.Wpf/Styles/Controls.xaml
@@ -2,5 +2,6 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="pack://application:,,,/Styles/Controls.Buttons.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Styles/Controls.ComboBox.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/WinPowerHelper.Wpf/Views/TimerControl.xaml b/WinPowerHelper.Wpf/Views/TimerControl.xaml
index cb85466..6341523 100644
--- a/WinPowerHelper.Wpf/Views/TimerControl.xaml
+++ b/WinPowerHelper.Wpf/Views/TimerControl.xaml
@@ -3,10 +3,11 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             mc:Ignorable="d" 
-             d:DesignHeight="180" d:DesignWidth="480"
+             mc:Ignorable="d"  d:DesignWidth="480"
+             xmlns:system="clr-namespace:System;assembly=System.Runtime" 
              x:Name="timespan">
     <UserControl.Resources>
+        <system:Double x:Key="NumberUnit.FontSize">96</system:Double>
         <Path x:Key="circle" Fill="Black" 
               VerticalAlignment="Center"
               HorizontalAlignment="Center"
@@ -34,14 +35,14 @@
             <ColumnDefinition/>
         </Grid.ColumnDefinitions>
         <Border Grid.Column="0">
-            <TextBlock FontSize="96" 
+            <TextBlock FontSize="{StaticResource NumberUnit.FontSize}" 
                        FontWeight="ExtraBold"
                        VerticalAlignment="Center"
                        HorizontalAlignment="Center"
                        Text="{Binding ElementName=timespan, UpdateSourceTrigger=PropertyChanged, Path=Hour1, FallbackValue=0}"/>
         </Border>
         <Border Grid.Column="1">
-            <TextBlock FontSize="96" 
+            <TextBlock FontSize="{StaticResource NumberUnit.FontSize}" 
                        FontWeight="ExtraBold"
                        VerticalAlignment="Center"
                        HorizontalAlignment="Center"
@@ -49,7 +50,7 @@
                        Text="{Binding ElementName=timespan, UpdateSourceTrigger=PropertyChanged, Path=Hour0, FallbackValue=2}"/>
         </Border>
         <Border Grid.Column="2">
-            <TextBlock FontSize="96" 
+            <TextBlock FontSize="{StaticResource NumberUnit.FontSize}" 
                        FontWeight="ExtraBold"
                        VerticalAlignment="Center"
                        HorizontalAlignment="Center"
@@ -57,30 +58,17 @@
                        TextAlignment="Center"
 
                        Text=":"/>
-            <!--<Grid>
-                <Grid.RowDefinitions>
-                    <RowDefinition/>
-                    <RowDefinition/>
-                </Grid.RowDefinitions>
-
-                <Border Grid.Row="0" Child="{StaticResource circle}">
-                    
-                </Border>
-                <Border Grid.Row="1" Child="{StaticResource circle}">
-
-                </Border>
-            </Grid>-->
         </Border>
 
         <Border Grid.Column="3">
-            <TextBlock FontSize="96" 
+            <TextBlock FontSize="{StaticResource NumberUnit.FontSize}" 
                        FontWeight="ExtraBold"
                        VerticalAlignment="Center"
                        HorizontalAlignment="Center"
                        Text="{Binding ElementName=timespan, Path=Minute1, UpdateSourceTrigger=PropertyChanged, FallbackValue=0}"/>
         </Border>
         <Border Grid.Column="4">
-            <TextBlock FontSize="96" 
+            <TextBlock FontSize="{StaticResource NumberUnit.FontSize}" 
                        FontWeight="ExtraBold"
                        VerticalAlignment="Center"
                        HorizontalAlignment="Center"
@@ -88,7 +76,7 @@
         </Border>
 
         <Border Grid.Column="5">
-            <TextBlock FontSize="96" 
+            <TextBlock FontSize="{StaticResource NumberUnit.FontSize}" 
                        FontWeight="ExtraBold"
                        VerticalAlignment="Center"
                        HorizontalAlignment="Center"
@@ -99,7 +87,7 @@
         </Border>
 
         <Border Grid.Column="6">
-            <TextBlock FontSize="96" 
+            <TextBlock FontSize="{StaticResource NumberUnit.FontSize}" 
                        FontWeight="ExtraBold"
                        VerticalAlignment="Center"
                        HorizontalAlignment="Center"
@@ -107,7 +95,7 @@
         </Border>
 
         <Border Grid.Column="7">
-            <TextBlock FontSize="96" 
+            <TextBlock FontSize="{StaticResource NumberUnit.FontSize}" 
                        FontWeight="ExtraBold"
                        VerticalAlignment="Center"
                        HorizontalAlignment="Center"