Fix #2332

Calendar ignores IsTodayHighlighted property Make some additional Style changes like setting the Foreground
MahApps · Apr 6, 2017 · 413b467 · 413b467
1 parent f31e8b2
commit 413b467
Show file tree

Hide file tree

Showing 5 changed files with 249 additions and 227 deletions.
diff --git a/docs/release-notes/1.5.0.md b/docs/release-notes/1.5.0.md
@@ -88,3 +88,4 @@
 - [#2857](https://github.com/MahApps/MahApps.Metro/issues/2857) HamburgerMenuItem Scrolling
 - [#1835](https://github.com/MahApps/MahApps.Metro/issues/1835) Window animation interferes with WindowsFormsHost positioning
 - [#2917](https://github.com/MahApps/MahApps.Metro/pull/2917) Hamburger Header Templating
+- [#2332](https://github.com/MahApps/MahApps.Metro/issues/2332) Calendar ignores IsTodayHighlighted property
diff --git a/...tro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.Shared/Behaviors/DateTimeNowBehavior.cs b/...tro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.Shared/Behaviors/DateTimeNowBehavior.cs
@@ -5,7 +5,7 @@
     using System.Windows.Threading;
     using MahApps.Metro.Controls;
 
-    internal class DateTimeNowBehavior : Behavior<DateTimePicker>
+    public class DateTimeNowBehavior : Behavior<DateTimePicker>
     {
         private DispatcherTimer _dispatcherTimer;
 

diff --git a/...Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.Shared/ExampleViews/DateExamples.xaml b/...Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.Shared/ExampleViews/DateExamples.xaml
@@ -63,8 +63,12 @@
                         VerticalAlignment="Top">
                 <Label Content="Calendar" Style="{DynamicResource DescriptionHeaderStyle}" />
 
-                <Calendar Margin="5" />
-                <Calendar Margin="5" IsEnabled="False" />
+                <CheckBox x:Name="IsTodayHighlightedCheckBox" Content="IsTodayHighlighted" IsChecked="True" />
+                <Calendar Margin="5"
+                          SelectionMode="MultipleRange" 
+                          DisplayDateStart="{x:Static system:DateTime.Now}"
+                          IsTodayHighlighted="{Binding ElementName=IsTodayHighlightedCheckBox, Path=IsChecked, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                <Calendar Margin="5" IsEnabled="False" HorizontalAlignment="Center" />
             </StackPanel>
 
             <StackPanel Grid.Row="0"

diff --git a/...o.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.Shared/ExampleWindows/ShowcaseFlyout.xaml b/...o.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.Shared/ExampleWindows/ShowcaseFlyout.xaml
@@ -5,6 +5,7 @@
                  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                  xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
                  xmlns:metroDemo="clr-namespace:MetroDemo"
+                 xmlns:system="clr-namespace:System;assembly=mscorlib"
                  mc:Ignorable="d"
                  d:DesignHeight="300"
                  d:DesignWidth="400"
@@ -211,6 +212,17 @@
                                  controls:TextBoxHelper.Watermark="TextBox 02" />
                     </StackPanel>
                 </TabItem>
+                <TabItem Header="Calendar">
+                    <StackPanel Orientation="Vertical">
+                        <CheckBox x:Name="IsTodayHighlightedCheckBox"
+                                  Content="IsTodayHighlighted"
+                                  IsChecked="True" />
+                        <Calendar Margin="5"
+                                  SelectionMode="MultipleRange"
+                                  DisplayDateStart="{x:Static system:DateTime.Now}"
+                                  IsTodayHighlighted="{Binding ElementName=IsTodayHighlightedCheckBox, Path=IsChecked, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                    </StackPanel>
+                </TabItem>
             </controls:MetroAnimatedTabControl>
         </StackPanel>
     </ScrollViewer>