Fix clock face background and color bindings

Author: BionicCode

BionicCode.Net/BionicCode.Controls.Net.Wpf/AnalogClockFace.cs

@@ -1367,7 +1367,7 @@ protected virtual void DrawAnalog24Clock()
       Draw24HHourIntervals();
       Draw24HMinuteIntervals();
       Draw24HSecondIntervals();
-      Draw24ClockFaceBackground(this.IntervalMarkerMinuteCenterRadius);
+      Draw24ClockFaceBackground();
       DrawTimePickerSelectionArcs();
       if (!this.IsTimePickerModeEnabled || this.IsTimePickerClockHandVisible)
       {
@@ -1799,9 +1799,9 @@ protected virtual void DrawTimePickerHoursSelectionBounds()
           });
     }
 
-    private void Draw24ClockFaceBackground(double intervalMarkerCenterPositionRadius)
+    private void Draw24ClockFaceBackground()
     {
-      double deltaToMiddleRadius = (this.Radius - this.IntervalMarkerMinuteCenterRadius) * 2;
+      double deltaToMiddleRadius = (this.Radius - this.IntervalMarkerCenterRadius) * 2;
       var clockFaceBackgroundPosition = new Point();
       clockFaceBackgroundPosition.Offset(deltaToMiddleRadius / 2, deltaToMiddleRadius / 2);
       var ellipse = new Ellipse()

BionicCode.Net/BionicCode.Controls.Net.Wpf/Themes/AnalogClockFaceStyle.xaml

@@ -16,7 +16,7 @@
         <SolidColorBrush Color="DodgerBlue" Opacity="0.6" />
       </Setter.Value>
     </Setter>
-    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="Background" Value="#FF252526" />
     <Setter Property="FontSize" Value="8" />
     <Setter Property="FontStretch" Value="UltraExpanded" />
     <Setter Property="FontWeight" Value="UltraLight" />

BionicCode.Net/BionicCode.Controls.Net.Wpf/Themes/AnalogTimePickerStyle.xaml

@@ -19,7 +19,8 @@
       <Setter.Value>
         <wpf:AnalogClockFace x:Name="AnalogClockFace"
                                IsTimePickerModeEnabled="True"
-                               Is24HModeEnabled="True" />
+                               Is24HModeEnabled="True" 
+                               Background="{Binding RelativeSource={RelativeSource AncestorType=wpf:AnalogTimePicker}, Path=Background}" />
       </Setter.Value>
     </Setter>
     <Setter Property="Template">
@@ -94,8 +95,8 @@
                 <ScaleTransform x:Name="PopupScaleTransform"/>
               </Popup.RenderTransform>-->
               <Border BorderThickness="1"
-                      BorderBrush="DarkGray"
-                      Background="#24292E"
+                      BorderBrush="DimGray"
+                      Background="{TemplateBinding Background}"
                       Margin="8"
                       Padding="8">
                 <Border.Effect>

BionicCode.Net/BionicCode.Net.Framework.Core.Ui.Test/MainWindow.xaml

@@ -7,13 +7,13 @@
         xmlns:wpf="clr-namespace:BionicCode.Controls.Net.Wpf;assembly=BionicCode.Controls.Net.Wpf"
         mc:Ignorable="d"
         Title="MainWindow" Height="450" Width="800" Name="Window"
-        Background="DimGray">
+        Background="#FF252526">
   <Window.Resources>
   </Window.Resources>
   <Grid>
-    <TextBlock Text="{Binding ElementName=TimePicker, Path=SelectedTime}"/>
-    <wpf:AnalogTimePicker x:Name="TimePicker"  Background="#24292E" Foreground="AntiqueWhite" IsClockHandVisible="False" Margin="0,20" />
-    <!--<wpf:AnalogClockFace x:Name="TimePicker" Background="DimGray" IsTimePickerModeEnabled="False" SelectedTime="{Binding ElementName=Window, Path=CurrentDateTime}"/>-->
+    <!--<TextBlock Text="{Binding ElementName=TimePicker, Path=SelectedTime}"/>
+    <wpf:AnalogTimePicker x:Name="TimePicker"  Background="#FF252526" Foreground="AntiqueWhite" IsClockHandVisible="False" Margin="0,20" />-->
+    <wpf:AnalogClockFace x:Name="TimePicker"  IsTimePickerModeEnabled="False" SelectedTime="{Binding ElementName=Window, Path=CurrentDateTime}"/>
   </Grid>
   <!--<StackPanel>
     <wpf:TimePicker x:Name="TimePicker" IsSecondsEnabled="True" IsOpen="True"/>