Restored inactive calendar buttons (#2802)

* Restore inactive calendar buttons

* Fixed failing DatePicker test

This test failed when local culture settings used dd.MM.yy instead of MM.dd.yy because the GetSelectedDate extension assumes US culture.

* Defer asserting on the elements of the context menu until it is visible

Co-authored-by: Kevin Bost <[email protected]>

Author: jizc

MaterialDesignThemes.UITests/WPF/ComboBoxes/ComboBoxTests.cs

@@ -114,7 +114,7 @@ public async Task OnEditableComboBox_WithDefaultContextMenu_ShowsCutCopyPaste()
 
         IVisualElement<ContextMenu>? contextMenu = await comboBox.GetContextMenu();
         Assert.True(contextMenu is not null, "No context menu set on the ComboBox");
-
+        await Wait.For(async () => await contextMenu!.GetIsVisible());
         await AssertMenu("Cut");
         await AssertMenu("Copy");
         await AssertMenu("Paste");

MaterialDesignThemes.UITests/WPF/DatePickers/DatePickerTests.cs

@@ -1,5 +1,6 @@
 using System;
 using System.ComponentModel;
+using System.Globalization;
 using System.Threading.Tasks;
 using System.Windows.Controls;
 using XamlTest;
@@ -41,9 +42,10 @@ public async Task OnDatePicker_WithClearButton_ClearsSelectedDate()
         {
             await using var recorder = new TestRecorder(App);
 
+            string dateString = DateTime.Today.ToString("d", CultureInfo.GetCultureInfoByIetfLanguageTag("en-US"));
             var stackPanel = await LoadXaml<StackPanel>($@"
 <StackPanel>
-    <DatePicker SelectedDate=""{DateTime.Today:d}"" materialDesign:TextFieldAssist.HasClearButton=""True""/>
+    <DatePicker SelectedDate=""{dateString}"" materialDesign:TextFieldAssist.HasClearButton=""True""/>
 </StackPanel>");
             var datePicker = await stackPanel.GetElement<DatePicker>("/DatePicker");
             var clearButton = await datePicker.GetElement<Button>("PART_ClearButton");

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Calendar.xaml

@@ -42,7 +42,7 @@
                                 <VisualState x:Name="Disabled">
                                     <Storyboard>
                                         <DoubleAnimation Duration="0" To="0" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="HighlightBackground"/>
-                                        <DoubleAnimation Duration="0" To=".35" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="NormalText"/>
+                                        <DoubleAnimation Duration="0" To=".38" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="NormalText"/>
                                     </Storyboard>
                                 </VisualState>
                             </VisualStateGroup>
@@ -116,22 +116,16 @@
                                  StrokeThickness="1" RadiusX="15" RadiusY="15" Height="30"/>
                     </Grid>
                     <ControlTemplate.Triggers>
-                        <Trigger Property="IsFocused" Value="False">
+                        <Trigger Property="HasSelectedDays" Value="False">
                             <Setter TargetName="NormalText" Property="TextElement.Foreground" Value="{Binding Foreground, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Calendar}}}"/>
                         </Trigger>
+                        <Trigger Property="IsInactive" Value="True">
+                            <Setter TargetName="NormalText" Property="Opacity" Value="0.56" />
+                        </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
-        <Style.Triggers>
-            <Trigger Property="IsInactive"
-                     Value="True">
-                <Setter Property="MinHeight"
-                        Value="0" />
-                <Setter Property="MaxHeight"
-                        Value="0" />
-            </Trigger>
-        </Style.Triggers>
     </Style>
 
     <Style x:Key="MaterialDesignCalendarDayButton" TargetType="{x:Type CalendarDayButton}">
@@ -233,11 +227,7 @@
                                         <DoubleAnimation Duration="0"
                                                          To="0"
                                                          Storyboard.TargetProperty="Opacity"
-                                                         Storyboard.TargetName="HighlightingBorder"/>
-                                        <DoubleAnimation Duration="0"
-                                                         To="0.38"
-                                                         Storyboard.TargetProperty="Opacity" 
-                                                         Storyboard.TargetName="NormalText" />
+                                                         Storyboard.TargetName="HighlightBackground"/>
                                     </Storyboard>
                                 </VisualState>
                             </VisualStateGroup>
@@ -274,22 +264,19 @@
                         <Trigger Property="IsSelected" Value="False">
                             <Setter TargetName="NormalText" Property="TextElement.Foreground" Value="{Binding Foreground, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Calendar}}}"/>
                         </Trigger>
+                        <Trigger Property="IsInactive" Value="True">
+                            <Setter TargetName="NormalText" Property="Opacity" Value="0.56" />
+                        </Trigger>
+                        <Trigger Property="IsBlackedOut" Value="True">
+                            <Setter TargetName="NormalText" Property="Opacity" Value="0.38" />
+                        </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
         <Style.Triggers>
-            <Trigger Property="IsInactive"
-                     Value="True">
-                <Setter Property="MinHeight"
-                        Value="0" />
-                <Setter Property="MaxHeight"
-                        Value="0" />
-            </Trigger>
-            <Trigger Property="IsBlackedOut"
-                     Value="True">
-                <Setter Property="Cursor"
-                        Value="No" />
+            <Trigger Property="IsBlackedOut" Value="True">
+                <Setter Property="Cursor" Value="Arrow" />
             </Trigger>
         </Style.Triggers>
     </Style>