From 564d76ef7c53edea5488b76b890774bd9d4346c9 Mon Sep 17 00:00:00 2001
From: Corvin <43533385+corvinsz@users.noreply.github.com>
Date: Tue, 28 Apr 2026 21:01:13 +0200
Subject: [PATCH 1/7] feat: add MinuteSelectionStep property to Clock adds a
 new property called MinuteSelectionStep to the Clock so consumers can control
 the interval/step of the minutes

---
 src/MaterialDesignThemes.Wpf/Clock.cs | 57 ++++++++++++++++++++++++---
 1 file changed, 52 insertions(+), 5 deletions(-)

diff --git a/src/MaterialDesignThemes.Wpf/Clock.cs b/src/MaterialDesignThemes.Wpf/Clock.cs
index 6217033d3c..12cf7aab44 100644
--- a/src/MaterialDesignThemes.Wpf/Clock.cs
+++ b/src/MaterialDesignThemes.Wpf/Clock.cs
@@ -237,6 +237,30 @@ public CornerRadius CornerRadius
         set => SetValue(CornerRadiusProperty, value);
     }
 
+    public static readonly DependencyProperty MinuteSelectionStepProperty = DependencyProperty.Register(
+        nameof(MinuteSelectionStep), typeof(int),typeof(Clock), new PropertyMetadata(1, MinuteSelectionStepPropertyChangedCallback));
+
+    private static void MinuteSelectionStepPropertyChangedCallback(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var clock = (Clock)d;
+
+        int step = (int)e.NewValue;
+
+        if (step < 1 || step > 60 || 60 % step != 0)
+            throw new ArgumentOutOfRangeException(
+                nameof(MinuteSelectionStep),
+                "MinuteSelectionStep must be a divisor of 60 and between 1 and 60.");
+
+        clock.GenerateButtons();
+    }
+
+    public int MinuteSelectionStep
+    {
+        get => (int)GetValue(MinuteSelectionStepProperty);
+        set => SetValue(MinuteSelectionStepProperty, value);
+    }
+
+
     public static readonly RoutedEvent ClockChoiceMadeEvent =
         EventManager.RegisterRoutedEvent(
             "ClockChoiceMade",
@@ -317,10 +341,17 @@ private void GenerateButtons()
         {
             RemoveExistingButtons(minutesCanvas);
 
-            GenerateButtons(minutesCanvas, Enumerable.Range(1, 60).ToList(), ButtonRadiusRatio,
+            GenerateButtons(
+                minutesCanvas,
+                Enumerable.Range(1, 60).ToList(),
+                ButtonRadiusRatio,
                 new ClockItemIsCheckedConverter(() => Time, ClockDisplayMode.Minutes, Is24Hours),
-                i => ((i / 5.0) % 1) == 0.0 ? "ButtonStyle" : "LesserButtonStyle", "0",
-                    ClockDisplayMode.Minutes);
+                i => ((i / 5.0) % 1) == 0.0
+                    ? "ButtonStyle"
+                    : "LesserButtonStyle",
+                "0",
+                ClockDisplayMode.Minutes,
+                i => (i % 60) % MinuteSelectionStep == 0);
         }
 
         if (GetTemplateChild(SecondsCanvasPartName) is Canvas secondsCanvas)
@@ -361,7 +392,8 @@ private void GenerateButtons(
         IValueConverter isCheckedConverter,
         Func<int, string> stylePropertySelector,
         string format,
-        ClockDisplayMode clockDisplayMode)
+        ClockDisplayMode clockDisplayMode,
+        Func<int, bool>? isEnabledSelector = null)
     {
         var anglePerItem = 360.0 / range.Count;
         var radiansPerItem = anglePerItem * (Math.PI / 180);
@@ -388,6 +420,16 @@ private void GenerateButtons(
             button.SetBinding(Canvas.TopProperty, GetBinding("Y", button));
 
             button.Content = (i == 60 ? 0 : (i == 24 && clockDisplayMode == ClockDisplayMode.Hours ? 0 : i)).ToString(format);
+
+            if (isEnabledSelector is not null)
+            {
+                bool isEnabled = isEnabledSelector.Invoke(i);
+                button.IsEnabled = isEnabled;
+                if (!isEnabled)
+                {
+                    button.Opacity = 0.38;
+                }
+            }
             canvas.Children.Add(button);
         }
 
@@ -476,7 +518,12 @@ private void ClockItemDragDeltaHandler(object sender, DragDeltaEventArgs dragDel
         }
         else
         {
-            var value = (int)Math.Round(30 * angle / Math.PI, MidpointRounding.AwayFromZero) % 60;
+            int rawValue = (int)Math.Round(30 * angle / Math.PI, MidpointRounding.AwayFromZero) % 60;
+
+            int value = DisplayMode == ClockDisplayMode.Minutes
+                ? ((int)Math.Round(rawValue / (double)MinuteSelectionStep, MidpointRounding.AwayFromZero)
+                    * MinuteSelectionStep) % 60
+                : rawValue;
             if (DisplayMode == ClockDisplayMode.Minutes)
                 time = new DateTime(Time.Year, Time.Month, Time.Day, Time.Hour, value, Time.Second);
             else

From 3b6eab0932659dcad6f56705c55dbd3729e21a84 Mon Sep 17 00:00:00 2001
From: Corvin <43533385+corvinsz@users.noreply.github.com>
Date: Tue, 28 Apr 2026 21:01:40 +0200
Subject: [PATCH 2/7] test(clock): ensure correct MinuteSelectionStep behavior

---
 .../ClockTests.cs                             | 73 +++++++++++++++++++
 1 file changed, 73 insertions(+)

diff --git a/tests/MaterialDesignThemes.Wpf.Tests/ClockTests.cs b/tests/MaterialDesignThemes.Wpf.Tests/ClockTests.cs
index 98a4237445..4530002056 100644
--- a/tests/MaterialDesignThemes.Wpf.Tests/ClockTests.cs
+++ b/tests/MaterialDesignThemes.Wpf.Tests/ClockTests.cs
@@ -82,4 +82,77 @@ void OnTimeChanged(object? sender, TimeChangedEventArgs e)
         await Assert.That(invocations[1].OldTime).IsEqualTo(now);
         await Assert.That(invocations[1].NewTime).IsEqualTo(now + TimeSpan.FromMinutes(-2));
     }
+
+
+    [Test]
+    [Arguments(1)]
+    [Arguments(2)]
+    [Arguments(3)]
+    [Arguments(4)]
+    [Arguments(5)]
+    [Arguments(6)]
+    [Arguments(10)]
+    [Arguments(12)]
+    [Arguments(15)]
+    [Arguments(20)]
+    [Arguments(30)]
+    [Arguments(60)]
+    public async Task MinuteSelectionStep_WhenSet_OnlyMatchingMinuteButtonsAreEnabled(int minuteSelectionStep)
+    {
+        var clock = new Clock
+        {
+            MinuteSelectionStep = minuteSelectionStep
+        };
+
+        clock.ApplyDefaultStyle();
+
+        Canvas minutesCanvas = clock.FindVisualChild<Canvas>(Clock.MinutesCanvasPartName);
+        var minuteButtons = minutesCanvas.GetVisualChildren<ClockItemButton>();
+
+        foreach (var button in minuteButtons)
+        {
+            int value = int.Parse(button.Content!.ToString()!);
+
+            bool shouldBeEnabled = value % minuteSelectionStep == 0;
+
+            await Assert.That(button.IsEnabled).IsEqualTo(shouldBeEnabled);
+            await Assert.That(button.Opacity).IsEqualTo(shouldBeEnabled ? 1d : 0.38d);
+        }
+    }
+
+    [Test]
+    public async Task MinuteSelectionStep_Default_AllButtonsAreEnabled()
+    {
+        var clock = new Clock();
+
+        clock.ApplyDefaultStyle();
+
+        Canvas minutesCanvas = clock.FindVisualChild<Canvas>(Clock.MinutesCanvasPartName);
+        var minuteButtons = minutesCanvas.GetVisualChildren<ClockItemButton>();
+
+        await Assert.That(minuteButtons.All(x => x.IsEnabled)).IsTrue();
+    }
+
+    [Test]
+    public async Task MinuteSelectionStep_DefaultValue_IsOne()
+    {
+        var clock = new Clock();
+
+        await Assert.That(clock.MinuteSelectionStep).IsEqualTo(1);
+    }
+
+    [Test]
+    [Arguments(0)]
+    [Arguments(-1)]
+    [Arguments(61)]
+    [Arguments(7)]
+    [Arguments(13)]
+    [Arguments(59)]
+    public async Task MinuteSelectionStep_InvalidValues_Throws(int value)
+    {
+        var clock = new Clock();
+
+        await Assert.That(() => clock.MinuteSelectionStep = value)
+            .Throws<ArgumentOutOfRangeException>();
+    }
 }

From caffc88c442491cbb557a54b8ece60ff73a42df0 Mon Sep 17 00:00:00 2001
From: Corvin <43533385+corvinsz@users.noreply.github.com>
Date: Wed, 29 Apr 2026 17:54:12 +0200
Subject: [PATCH 3/7] test: correctly assert MinuteSelectionStep throws on
 invalid values

---
 tests/MaterialDesignThemes.Wpf.Tests/ClockTests.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/MaterialDesignThemes.Wpf.Tests/ClockTests.cs b/tests/MaterialDesignThemes.Wpf.Tests/ClockTests.cs
index 4530002056..9669aff9d1 100644
--- a/tests/MaterialDesignThemes.Wpf.Tests/ClockTests.cs
+++ b/tests/MaterialDesignThemes.Wpf.Tests/ClockTests.cs
@@ -152,7 +152,8 @@ public async Task MinuteSelectionStep_InvalidValues_Throws(int value)
     {
         var clock = new Clock();
 
-        await Assert.That(() => clock.MinuteSelectionStep = value)
-            .Throws<ArgumentOutOfRangeException>();
+        var ex = Assert.Throws<ArgumentOutOfRangeException>(() => clock.MinuteSelectionStep = value);
+
+        await Assert.That(ex.Message).IsEqualTo($"{nameof(Clock.MinuteSelectionStep)} must be a divisor of 60 and between 1 and 60. (Parameter '{nameof(Clock.MinuteSelectionStep)}')");
     }
 }

From b0c8e8f81b1413e55fa402ba2deed8d572f792af Mon Sep 17 00:00:00 2001
From: Corvin <43533385+corvinsz@users.noreply.github.com>
Date: Wed, 29 Apr 2026 18:18:22 +0200
Subject: [PATCH 4/7] docs: add MinuteSelectionStep example to MD2/3 demo apps
 and consolidate viewmodels

---
 src/MainDemo.Wpf/Domain/PickersViewModel.cs   |  41 ---
 src/MainDemo.Wpf/Pickers.xaml                 | 255 ++++++++----------
 .../Domain/PickersViewModel.cs                |  41 ---
 src/MaterialDesign3.Demo.Wpf/Pickers.xaml     |  34 ++-
 src/MaterialDesign3.Demo.Wpf/Pickers.xaml.cs  |   2 +-
 .../Domain/PickersViewModel.cs                |  29 ++
 6 files changed, 166 insertions(+), 236 deletions(-)
 delete mode 100644 src/MainDemo.Wpf/Domain/PickersViewModel.cs
 delete mode 100644 src/MaterialDesign3.Demo.Wpf/Domain/PickersViewModel.cs
 create mode 100644 src/MaterialDesignDemo.Shared/Domain/PickersViewModel.cs

diff --git a/src/MainDemo.Wpf/Domain/PickersViewModel.cs b/src/MainDemo.Wpf/Domain/PickersViewModel.cs
deleted file mode 100644
index 1a8c480f47..0000000000
--- a/src/MainDemo.Wpf/Domain/PickersViewModel.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using MaterialDesignDemo.Shared.Domain;
-
-namespace MaterialDesignDemo.Domain;
-
-public class PickersViewModel : ViewModelBase
-{
-    private DateTime _date;
-    private DateTime _time;
-    private string? _validatingTime;
-    private DateTime? _futureValidatingDate;
-
-    public PickersViewModel()
-    {
-        Date = DateTime.Now;
-        Time = DateTime.Now;
-    }
-
-    public DateTime Date
-    {
-        get => _date;
-        set => SetProperty(ref _date, value);
-    }
-
-    public DateTime Time
-    {
-        get => _time;
-        set => SetProperty(ref _time, value);
-    }
-
-    public string? ValidatingTime
-    {
-        get => _validatingTime;
-        set => SetProperty(ref _validatingTime, value);
-    }
-
-    public DateTime? FutureValidatingDate
-    {
-        get => _futureValidatingDate;
-        set => SetProperty(ref _futureValidatingDate, value);
-    }
-}
diff --git a/src/MainDemo.Wpf/Pickers.xaml b/src/MainDemo.Wpf/Pickers.xaml
index 18deca9fb8..86979d9100 100644
--- a/src/MainDemo.Wpf/Pickers.xaml
+++ b/src/MainDemo.Wpf/Pickers.xaml
@@ -12,8 +12,7 @@
              d:DesignWidth="1920"
              mc:Ignorable="d">
   <StackPanel>
-    <TextBlock Text="Pickers"
-               Style="{StaticResource PageTitleTextBlock}" />
+    <TextBlock Style="{StaticResource PageTitleTextBlock}" Text="Pickers" />
 
     <TextBlock Text="Classic WPF DatePicker control with Material Design theme, and new TimePicker control:" />
 
@@ -31,45 +30,32 @@
         <smtx:XamlDisplay Margin="0,16,0,0"
                           HorizontalAlignment="Left"
                           UniqueKey="pickers_custom">
-          <DatePicker Width="100"
-                      materialDesign:HintAssist.Hint="Custom">
+          <DatePicker Width="100" materialDesign:HintAssist.Hint="Custom">
             <DatePicker.Resources>
               <Style x:Key="CustomCalendarDayButton"
                      TargetType="CalendarDayButton"
                      BasedOn="{StaticResource MaterialDesignCalendarDayButton}">
-                <Setter Property="materialDesign:CalendarAssist.SelectionColor"
-                        Value="#B2F39B" />
-                <Setter Property="materialDesign:CalendarAssist.SelectionForegroundColor"
-                        Value="Black" />
+                <Setter Property="materialDesign:CalendarAssist.SelectionColor" Value="#B2F39B" />
+                <Setter Property="materialDesign:CalendarAssist.SelectionForegroundColor" Value="Black" />
               </Style>
               <Style x:Key="CustomCalendarButton"
                      TargetType="CalendarButton"
                      BasedOn="{StaticResource MaterialDesignCalendarButton}">
-                <Setter Property="materialDesign:CalendarAssist.SelectionColor"
-                        Value="#B2F39B" />
-                <Setter Property="materialDesign:CalendarAssist.SelectionForegroundColor"
-                        Value="Black" />
+                <Setter Property="materialDesign:CalendarAssist.SelectionColor" Value="#B2F39B" />
+                <Setter Property="materialDesign:CalendarAssist.SelectionForegroundColor" Value="Black" />
               </Style>
               <Style x:Key="CustomCalendar"
                      TargetType="{x:Type Calendar}"
                      BasedOn="{StaticResource MaterialDesignDatePickerCalendarPortrait}">
-                <Setter Property="Background"
-                        Value="#343C3F" />
-                <Setter Property="CalendarButtonStyle"
-                        Value="{StaticResource CustomCalendarButton}" />
-                <Setter Property="CalendarDayButtonStyle"
-                        Value="{StaticResource CustomCalendarDayButton}" />
-                <Setter Property="Foreground"
-                        Value="White" />
-                <Setter Property="materialDesign:CalendarAssist.HeaderBackground"
-                        Value="#A2E9FF" />
-                <Setter Property="materialDesign:CalendarAssist.HeaderForeground"
-                        Value="Black" />
+                <Setter Property="Background" Value="#343C3F" />
+                <Setter Property="CalendarButtonStyle" Value="{StaticResource CustomCalendarButton}" />
+                <Setter Property="CalendarDayButtonStyle" Value="{StaticResource CustomCalendarDayButton}" />
+                <Setter Property="Foreground" Value="White" />
+                <Setter Property="materialDesign:CalendarAssist.HeaderBackground" Value="#A2E9FF" />
+                <Setter Property="materialDesign:CalendarAssist.HeaderForeground" Value="Black" />
               </Style>
-              <Style TargetType="DatePicker"
-                     BasedOn="{StaticResource MaterialDesignFloatingHintDatePicker}">
-                <Setter Property="CalendarStyle"
-                        Value="{StaticResource CustomCalendar}" />
+              <Style TargetType="DatePicker" BasedOn="{StaticResource MaterialDesignFloatingHintDatePicker}">
+                <Setter Property="CalendarStyle" Value="{StaticResource CustomCalendar}" />
               </Style>
             </DatePicker.Resources>
           </DatePicker>
@@ -83,8 +69,7 @@
                       materialDesign:CalendarAssist.IsHeaderVisible="False"
                       materialDesign:HintAssist.Hint="Future Date">
             <DatePicker.SelectedDate>
-              <Binding Path="FutureValidatingDate"
-                       UpdateSourceTrigger="PropertyChanged">
+              <Binding Path="FutureValidatingDate" UpdateSourceTrigger="PropertyChanged">
                 <Binding.ValidationRules>
                   <domain:FutureDateValidationRule ValidatesOnTargetUpdated="True" />
                 </Binding.ValidationRules>
@@ -104,8 +89,7 @@
         <smtx:XamlDisplay Margin="0,32,0,0"
                           HorizontalAlignment="Left"
                           UniqueKey="pickers_3">
-          <ComboBox Name="LocaleCombo"
-                    Width="50">
+          <ComboBox Name="LocaleCombo" Width="50">
             <ComboBox.ItemsPanel>
               <ItemsPanelTemplate>
                 <VirtualizingStackPanel />
@@ -174,9 +158,9 @@
                           HorizontalAlignment="Left"
                           UniqueKey="pickers_unchanging_borderthickness">
           <DatePicker Width="140"
-                      BorderThickness="2"
                       materialDesign:HintAssist.HelperText="Helper text"
                       materialDesign:HintAssist.Hint="Pick Date"
+                      BorderThickness="2"
                       Style="{StaticResource MaterialDesignOutlinedDatePicker}" />
         </smtx:XamlDisplay>
 
@@ -184,10 +168,10 @@
                           HorizontalAlignment="Left"
                           UniqueKey="pickers_14_custom_borderthickness">
           <DatePicker Width="140"
-                      materialDesign:TextFieldAssist.OutlinedBorderActiveThickness="3"
-                      BorderThickness="3"
                       materialDesign:HintAssist.HelperText="Helper text"
                       materialDesign:HintAssist.Hint="Pick Date"
+                      materialDesign:TextFieldAssist.OutlinedBorderActiveThickness="3"
+                      BorderThickness="3"
                       Style="{StaticResource MaterialDesignOutlinedDatePicker}" />
         </smtx:XamlDisplay>
 
@@ -216,41 +200,38 @@
 
       <StackPanel>
         <smtx:XamlDisplay Margin="0,16,0,0"
-                  HorizontalAlignment="Left"
-                  VerticalAlignment="Top"
-                  UniqueKey="pickers_7">
+                          HorizontalAlignment="Left"
+                          VerticalAlignment="Top"
+                          UniqueKey="pickers_7">
           <materialDesign:TimePicker x:Name="PresetTimePicker"
-                             Width="100"
-                             Is24Hours="True"
-                             SelectedTimeChanged="PresetTimePicker_SelectedTimeChanged" />
+                                     Width="100"
+                                     Is24Hours="True"
+                                     SelectedTimeChanged="PresetTimePicker_SelectedTimeChanged" />
         </smtx:XamlDisplay>
 
         <smtx:XamlDisplay Margin="0,16,0,0"
-                  HorizontalAlignment="Left"
-                  VerticalAlignment="Top"
-                  UniqueKey="pickers_15">
-          <materialDesign:TimePicker ClockButtonVisibility="{Binding IsChecked, ElementName=IsClockButtonVisible, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.CollapsedInstance}}"
-                             Width="100"
-                             Is24Hours="True" />
+                          HorizontalAlignment="Left"
+                          VerticalAlignment="Top"
+                          UniqueKey="pickers_15">
+          <materialDesign:TimePicker Width="100"
+                                     ClockButtonVisibility="{Binding IsChecked, ElementName=IsClockButtonVisible, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.CollapsedInstance}}"
+                                     Is24Hours="True" />
         </smtx:XamlDisplay>
         <CheckBox x:Name="IsClockButtonVisible"
                   Margin="0,10,0,0"
                   VerticalAlignment="Top"
                   Content="Show clock button" />
       </StackPanel>
-      
 
-      <StackPanel HorizontalAlignment="Left"
-                  VerticalAlignment="Top">
-        <smtx:XamlDisplay Margin="0,16,0,0"
-                          UniqueKey="pickers_8">
+
+      <StackPanel HorizontalAlignment="Left" VerticalAlignment="Top">
+        <smtx:XamlDisplay Margin="0,16,0,0" UniqueKey="pickers_8">
           <materialDesign:TimePicker Width="100"
                                      materialDesign:HintAssist.Hint="Validates"
                                      Is24Hours="{Binding IsChecked, ElementName=Is24HourCheckbox}"
                                      IsInvalidTextAllowed="True">
             <materialDesign:TimePicker.Text>
-              <Binding Path="ValidatingTime"
-                       UpdateSourceTrigger="PropertyChanged">
+              <Binding Path="ValidatingTime" UpdateSourceTrigger="PropertyChanged">
                 <Binding.ValidationRules>
                   <domain:SimpleDateValidationRule ValidatesOnTargetUpdated="True" />
                 </Binding.ValidationRules>
@@ -280,12 +261,11 @@
 
     <Rectangle Style="{StaticResource PageSectionSeparator}" />
 
-    <TextBlock Text="Custom popups"
-               Style="{StaticResource PageSectionTitleTextBlock}" />
+    <TextBlock Style="{StaticResource PageSectionTitleTextBlock}" Text="Custom popups" />
 
     <TextBlock Text="By combining the DialogHost (see MainWindow.xaml) and the Calendar and Clock controls, custom popups can be built." />
 
-    <WrapPanel Margin="0 0 0 32">
+    <WrapPanel Margin="0,0,0,32">
       <smtx:XamlDisplay Grid.Row="3"
                         Grid.Column="0"
                         Margin="0,32,0,0"
@@ -307,10 +287,8 @@
                   <RowDefinition Height="Auto" />
                   <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
-                <Viewbox Width="300"
-                         Stretch="Uniform">
-                  <Calendar x:Name="Calendar"
-                            Margin="-1,-4,-1,0" />
+                <Viewbox Width="300" Stretch="Uniform">
+                  <Calendar x:Name="Calendar" Margin="-1,-4,-1,0" />
                 </Viewbox>
 
 
@@ -355,8 +333,7 @@
                   <RowDefinition Height="Auto" />
                   <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
-                <materialDesign:Clock x:Name="Clock"
-                                      DisplayAutomation="ToSeconds" />
+                <materialDesign:Clock x:Name="Clock" DisplayAutomation="ToSeconds" />
 
                 <StackPanel Grid.Row="1"
                             Margin="8"
@@ -399,10 +376,8 @@
                   <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
 
-                <StackPanel Grid.Row="0"
-                            Orientation="Horizontal">
-                  <Calendar x:Name="CombinedCalendar"
-                            Margin="-1,-4,-1,0" />
+                <StackPanel Grid.Row="0" Orientation="Horizontal">
+                  <Calendar x:Name="CombinedCalendar" Margin="-1,-4,-1,0" />
 
                   <materialDesign:Clock x:Name="CombinedClock"
                                         DisplayAutomation="CycleWithSeconds"
@@ -432,101 +407,87 @@
 
     <Rectangle Style="{StaticResource PageSectionSeparator}" />
 
-    <TextBlock Text="Calendar Picker Styles"
-               Style="{StaticResource PageSectionTitleTextBlock}" />
+    <TextBlock Style="{StaticResource PageSectionTitleTextBlock}" Text="Calendar Picker Styles" />
 
     <WrapPanel>
-      <StackPanel Margin="0 0 16 16">
-        <TextBlock Text="Default"
-                   Margin="0 0 0 8" />
+      <StackPanel Margin="0,0,16,16">
+        <TextBlock Margin="0,0,0,8" Text="Default" />
 
         <smtx:XamlDisplay UniqueKey="calendar_1">
           <Calendar IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}" />
         </smtx:XamlDisplay>
       </StackPanel>
 
-      <StackPanel Margin="0 0 16 16">
-        <TextBlock Text="Custom colors"
-                   Margin="0 0 0 8" />
+      <StackPanel Margin="0,0,16,16">
+        <TextBlock Margin="0,0,0,8" Text="Custom colors" />
         <smtx:XamlDisplay UniqueKey="calendar_2">
           <Grid>
             <Grid.Resources>
               <Style x:Key="SecondaryCalendarDayButton"
                      TargetType="CalendarDayButton"
                      BasedOn="{StaticResource MaterialDesignCalendarDayButton}">
-                <Setter Property="materialDesign:CalendarAssist.SelectionColor"
-                        Value="{DynamicResource SecondaryHueMidBrush}" />
-                <Setter Property="materialDesign:CalendarAssist.SelectionForegroundColor"
-                        Value="{DynamicResource SecondaryHueMidForegroundBrush}" />
+                <Setter Property="materialDesign:CalendarAssist.SelectionColor" Value="{DynamicResource SecondaryHueMidBrush}" />
+                <Setter Property="materialDesign:CalendarAssist.SelectionForegroundColor" Value="{DynamicResource SecondaryHueMidForegroundBrush}" />
               </Style>
               <Style x:Key="SecondaryCalendarButton"
                      TargetType="CalendarButton"
                      BasedOn="{StaticResource MaterialDesignCalendarButton}">
-                <Setter Property="materialDesign:CalendarAssist.SelectionColor"
-                        Value="{DynamicResource SecondaryHueMidBrush}" />
-                <Setter Property="materialDesign:CalendarAssist.SelectionForegroundColor"
-                        Value="{DynamicResource SecondaryHueMidForegroundBrush}" />
+                <Setter Property="materialDesign:CalendarAssist.SelectionColor" Value="{DynamicResource SecondaryHueMidBrush}" />
+                <Setter Property="materialDesign:CalendarAssist.SelectionForegroundColor" Value="{DynamicResource SecondaryHueMidForegroundBrush}" />
               </Style>
             </Grid.Resources>
             <Calendar materialDesign:CalendarAssist.HeaderBackground="{DynamicResource PrimaryHueDarkBrush}"
                       materialDesign:CalendarAssist.HeaderForeground="{DynamicResource PrimaryHueDarkForegroundBrush}"
-                      IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}" 
                       Background="{DynamicResource PrimaryHueLightBrush}"
                       CalendarButtonStyle="{StaticResource SecondaryCalendarButton}"
                       CalendarDayButtonStyle="{StaticResource SecondaryCalendarDayButton}"
-                      Foreground="{DynamicResource PrimaryHueLightForegroundBrush}" />
+                      Foreground="{DynamicResource PrimaryHueLightForegroundBrush}"
+                      IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}" />
           </Grid>
         </smtx:XamlDisplay>
       </StackPanel>
 
-      <StackPanel Margin="0 0 16 16">
-        <TextBlock Text="More custom colors"
-                   Margin="0 0 0 8" />
+      <StackPanel Margin="0,0,16,16">
+        <TextBlock Margin="0,0,0,8" Text="More custom colors" />
         <smtx:XamlDisplay UniqueKey="calendar_3">
           <Grid>
             <Grid.Resources>
               <Style x:Key="CustomCalendarDayButton"
                      TargetType="CalendarDayButton"
                      BasedOn="{StaticResource MaterialDesignCalendarDayButton}">
-                <Setter Property="materialDesign:CalendarAssist.SelectionColor"
-                        Value="#B2F39B" />
-                <Setter Property="materialDesign:CalendarAssist.SelectionForegroundColor"
-                        Value="Black" />
+                <Setter Property="materialDesign:CalendarAssist.SelectionColor" Value="#B2F39B" />
+                <Setter Property="materialDesign:CalendarAssist.SelectionForegroundColor" Value="Black" />
               </Style>
               <Style x:Key="CustomCalendarButton"
                      TargetType="CalendarButton"
                      BasedOn="{StaticResource MaterialDesignCalendarButton}">
-                <Setter Property="materialDesign:CalendarAssist.SelectionColor"
-                        Value="#B2F39B" />
-                <Setter Property="materialDesign:CalendarAssist.SelectionForegroundColor"
-                        Value="Black" />
+                <Setter Property="materialDesign:CalendarAssist.SelectionColor" Value="#B2F39B" />
+                <Setter Property="materialDesign:CalendarAssist.SelectionForegroundColor" Value="Black" />
               </Style>
             </Grid.Resources>
             <Calendar materialDesign:CalendarAssist.HeaderBackground="#A2E9FF"
-                      IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}" 
                       materialDesign:CalendarAssist.HeaderForeground="Black"
                       Background="#343C3F"
                       CalendarButtonStyle="{StaticResource CustomCalendarButton}"
                       CalendarDayButtonStyle="{StaticResource CustomCalendarDayButton}"
-                      Foreground="White" />
+                      Foreground="White"
+                      IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}" />
           </Grid>
         </smtx:XamlDisplay>
       </StackPanel>
 
-      <StackPanel Margin="0 0 16 16">
-        <TextBlock Text="Horizontal"
-                   Margin=" 0 0 0 8" />
+      <StackPanel Margin="0,0,16,16">
+        <TextBlock Margin="0,0,0,8" Text="Horizontal" />
         <smtx:XamlDisplay UniqueKey="calendar_4">
-          <Calendar materialDesign:CalendarAssist.Orientation="Horizontal" IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"  />
+          <Calendar materialDesign:CalendarAssist.Orientation="Horizontal" IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}" />
         </smtx:XamlDisplay>
       </StackPanel>
 
-      <StackPanel Margin="0 0 16 16">
-        <TextBlock Text="Transparent header and shadow"
-                   Margin="0 0 0 8" />
+      <StackPanel Margin="0,0,16,16">
+        <TextBlock Margin="0,0,0,8" Text="Transparent header and shadow" />
         <smtx:XamlDisplay UniqueKey="calendar_5">
           <Calendar materialDesign:ElevationAssist.Elevation="Dp8"
-                    IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}" 
+                    IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"
                     Style="{StaticResource MaterialDesignCalendarPortraitForeground}" />
         </smtx:XamlDisplay>
       </StackPanel>
@@ -534,13 +495,11 @@
 
     <Rectangle Style="{StaticResource PageSectionSeparator}" />
 
-    <TextBlock Text="24h Clock Picker Styles"
-               Style="{StaticResource PageSectionTitleTextBlock}" />
+    <TextBlock Style="{StaticResource PageSectionTitleTextBlock}" Text="24h Clock Picker Styles" />
 
     <WrapPanel>
-      <StackPanel Margin="0 0 16 16">
-        <TextBlock Text="MaterialDesignClock"
-                   Margin="0 0 0 8" />
+      <StackPanel Margin="0,0,16,16">
+        <TextBlock Margin="0,0,0,8" Text="MaterialDesignClock" />
         <smtx:XamlDisplay UniqueKey="clock_1">
           <materialDesign:Clock Width="auto"
                                 DisplayAutomation="CycleWithSeconds"
@@ -549,9 +508,8 @@
         </smtx:XamlDisplay>
       </StackPanel>
 
-      <StackPanel Margin="0 0 16 16">
-        <TextBlock Text="No header"
-                   Margin="0 0 0 8" />
+      <StackPanel Margin="0,0,16,16">
+        <TextBlock Margin="0,0,0,8" Text="No header" />
         <smtx:XamlDisplay UniqueKey="clock_2">
           <materialDesign:Clock Width="auto"
                                 DisplayAutomation="CycleWithSeconds"
@@ -560,9 +518,8 @@
         </smtx:XamlDisplay>
       </StackPanel>
 
-      <StackPanel Margin="0 0 16 16">
-        <TextBlock Text="MaterialDesignClockHorizontal"
-                   Margin="0 0 0 8" />
+      <StackPanel Margin="0,0,16,16">
+        <TextBlock Margin="0,0,0,8" Text="MaterialDesignClockHorizontal" />
         <smtx:XamlDisplay UniqueKey="clock_3">
           <materialDesign:Clock Width="auto"
                                 DisplayAutomation="CycleWithSeconds"
@@ -571,9 +528,8 @@
         </smtx:XamlDisplay>
       </StackPanel>
 
-      <StackPanel Margin="0 0 16 16">
-        <TextBlock Text="MaterialDesignClockVertical"
-                   Margin="0 0 0 8" />
+      <StackPanel Margin="0,0,16,16">
+        <TextBlock Margin="0,0,0,8" Text="MaterialDesignClockVertical" />
         <smtx:XamlDisplay UniqueKey="clock_4">
           <materialDesign:Clock Width="auto"
                                 DisplayAutomation="CycleWithSeconds"
@@ -582,9 +538,8 @@
         </smtx:XamlDisplay>
       </StackPanel>
 
-      <StackPanel Margin="0 0 16 16">
-        <TextBlock Text="MaterialDesignClockHorizontalThemed"
-                   Margin="0 0 0 8" />
+      <StackPanel Margin="0,0,16,16">
+        <TextBlock Margin="0,0,0,8" Text="MaterialDesignClockHorizontalThemed" />
         <smtx:XamlDisplay UniqueKey="clock_5">
           <materialDesign:Clock Width="auto"
                                 DisplayAutomation="CycleWithSeconds"
@@ -593,9 +548,8 @@
         </smtx:XamlDisplay>
       </StackPanel>
 
-      <StackPanel Margin="0 0 16 16">
-        <TextBlock Text="MaterialDesignClockVerticalThemed"
-                   Margin="0 0 0 8" />
+      <StackPanel Margin="0,0,16,16">
+        <TextBlock Margin="0,0,0,8" Text="MaterialDesignClockVerticalThemed" />
         <smtx:XamlDisplay UniqueKey="clock_6">
           <materialDesign:Clock Width="auto"
                                 DisplayAutomation="CycleWithSeconds"
@@ -603,18 +557,30 @@
                                 Style="{StaticResource MaterialDesignClockVerticalThemed}" />
         </smtx:XamlDisplay>
       </StackPanel>
+
+      <StackPanel Margin="0,0,16,16">
+        <TextBlock Margin="0,0,0,8" Text="You can change the granularity of selectable times with the MinuteSelectionStep property." />
+        <ComboBox materialDesign:HintAssist.Hint="MinuteSelectionStep"
+                  ItemsSource="{Binding AvailableMinuteSelectionSteps}"
+                  SelectedItem="{Binding SelectedMinuteSelectionStep}"
+                  Style="{StaticResource MaterialDesignFilledComboBox}" />
+        <smtx:XamlDisplay UniqueKey="clock_7">
+          <materialDesign:Clock Width="auto"
+                                MinuteSelectionStep="{Binding SelectedMinuteSelectionStep}"
+                                Is24Hours="True"
+                                Style="{StaticResource MaterialDesignClock}" />
+        </smtx:XamlDisplay>
+      </StackPanel>
     </WrapPanel>
 
     <Rectangle Style="{StaticResource PageSectionSeparator}" />
 
-    <TextBlock Text="12h Clock Picker Styles"
-               Style="{StaticResource PageSectionTitleTextBlock}" />
+    <TextBlock Style="{StaticResource PageSectionTitleTextBlock}" Text="12h Clock Picker Styles" />
 
     <WrapPanel>
-      <StackPanel Margin="0 0 16 16">
-        <TextBlock Text="MaterialDesignClock"
-                   Margin="0 0 0 8" />
-        <smtx:XamlDisplay UniqueKey="clock_7">
+      <StackPanel Margin="0,0,16,16">
+        <TextBlock Margin="0,0,0,8" Text="MaterialDesignClock" />
+        <smtx:XamlDisplay UniqueKey="clock_13">
           <materialDesign:Clock Width="auto"
                                 DisplayAutomation="ToSeconds"
                                 Is24Hours="False"
@@ -623,9 +589,8 @@
         </smtx:XamlDisplay>
       </StackPanel>
 
-      <StackPanel Margin="0 0 16 16">
-        <TextBlock Text="No header"
-                   Margin="0 0 0 8" />
+      <StackPanel Margin="0,0,16,16">
+        <TextBlock Margin="0,0,0,8" Text="No header" />
         <smtx:XamlDisplay UniqueKey="clock_8">
           <materialDesign:Clock Width="auto"
                                 DisplayAutomation="ToSeconds"
@@ -635,9 +600,8 @@
         </smtx:XamlDisplay>
       </StackPanel>
 
-      <StackPanel Margin="0 0 16 16">
-        <TextBlock Text="MaterialDesignClockHorizontal"
-                   Margin="0 0 0 8" />
+      <StackPanel Margin="0,0,16,16">
+        <TextBlock Margin="0,0,0,8" Text="MaterialDesignClockHorizontal" />
         <smtx:XamlDisplay UniqueKey="clock_9">
           <materialDesign:Clock DisplayAutomation="CycleWithSeconds"
                                 Is24Hours="False"
@@ -646,9 +610,8 @@
         </smtx:XamlDisplay>
       </StackPanel>
 
-      <StackPanel Margin=" 0 0 16 16">
-        <TextBlock Text="MaterialDesignClockVertical"
-                   Margin="0 0 0 8" />
+      <StackPanel Margin="0,0,16,16">
+        <TextBlock Margin="0,0,0,8" Text="MaterialDesignClockVertical" />
         <smtx:XamlDisplay UniqueKey="clock_10">
           <materialDesign:Clock DisplayAutomation="CycleWithSeconds"
                                 Is24Hours="False"
@@ -657,9 +620,8 @@
         </smtx:XamlDisplay>
       </StackPanel>
 
-      <StackPanel Margin="0 0 16 16">
-        <TextBlock Text="MaterialDesignClockHorizontalThemed"
-                   Margin="0 0 0 8" />
+      <StackPanel Margin="0,0,16,16">
+        <TextBlock Margin="0,0,0,8" Text="MaterialDesignClockHorizontalThemed" />
         <smtx:XamlDisplay UniqueKey="clock_11">
           <materialDesign:Clock Width="auto"
                                 DisplayAutomation="CycleWithSeconds"
@@ -669,9 +631,8 @@
         </smtx:XamlDisplay>
       </StackPanel>
 
-      <StackPanel Margin="0 0 16 16">
-        <TextBlock Text="MaterialDesignClockVerticalThemed"
-                   Margin="0 0 0 8" />
+      <StackPanel Margin="0,0,16,16">
+        <TextBlock Margin="0,0,0,8" Text="MaterialDesignClockVerticalThemed" />
         <smtx:XamlDisplay UniqueKey="clock_12">
           <materialDesign:Clock Width="auto"
                                 DisplayAutomation="CycleWithSeconds"
diff --git a/src/MaterialDesign3.Demo.Wpf/Domain/PickersViewModel.cs b/src/MaterialDesign3.Demo.Wpf/Domain/PickersViewModel.cs
deleted file mode 100644
index ddd0f88f3b..0000000000
--- a/src/MaterialDesign3.Demo.Wpf/Domain/PickersViewModel.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using MaterialDesignDemo.Shared.Domain;
-
-namespace MaterialDesign3Demo.Domain;
-
-public class PickersViewModel : ViewModelBase
-{
-    private DateTime _date;
-    private DateTime _time;
-    private string? _validatingTime;
-    private DateTime? _futureValidatingDate;
-
-    public PickersViewModel()
-    {
-        Date = DateTime.Now;
-        Time = DateTime.Now;
-    }
-
-    public DateTime Date
-    {
-        get => _date;
-        set => SetProperty(ref _date, value);
-    }
-
-    public DateTime Time
-    {
-        get => _time;
-        set => SetProperty(ref _time, value);
-    }
-
-    public string? ValidatingTime
-    {
-        get => _validatingTime;
-        set => SetProperty(ref _validatingTime, value);
-    }
-
-    public DateTime? FutureValidatingDate
-    {
-        get => _futureValidatingDate;
-        set => SetProperty(ref _futureValidatingDate, value);
-    }
-}
diff --git a/src/MaterialDesign3.Demo.Wpf/Pickers.xaml b/src/MaterialDesign3.Demo.Wpf/Pickers.xaml
index f38eb0ef0f..186a5b74dd 100644
--- a/src/MaterialDesign3.Demo.Wpf/Pickers.xaml
+++ b/src/MaterialDesign3.Demo.Wpf/Pickers.xaml
@@ -407,11 +407,11 @@
                 </Grid.Resources>
                 <Calendar materialDesign:CalendarAssist.HeaderBackground="{DynamicResource MaterialDesign.Brush.Primary.Dark}"
                           materialDesign:CalendarAssist.HeaderForeground="{DynamicResource MaterialDesign.Brush.Primary.Dark.Foreground}"
-                          IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"
                           Background="{DynamicResource MaterialDesign.Brush.Primary.Light}"
                           CalendarButtonStyle="{StaticResource SecondaryCalendarButton}"
                           CalendarDayButtonStyle="{StaticResource SecondaryCalendarDayButton}"
-                          Foreground="{DynamicResource MaterialDesign.Brush.Primary.Light.Foreground}" />
+                          Foreground="{DynamicResource MaterialDesign.Brush.Primary.Light.Foreground}"
+                          IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}" />
               </Grid>
             </smtx:XamlDisplay>
           </GroupBox>
@@ -439,11 +439,11 @@
                 </Grid.Resources>
                 <Calendar materialDesign:CalendarAssist.HeaderBackground="#A2E9FF"
                           materialDesign:CalendarAssist.HeaderForeground="Black"
-                          IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"
                           Background="#343C3F"
                           CalendarButtonStyle="{StaticResource CustomCalendarButton}"
                           CalendarDayButtonStyle="{StaticResource CustomCalendarDayButton}"
-                          Foreground="White" />
+                          Foreground="White"
+                          IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}" />
               </Grid>
             </smtx:XamlDisplay>
           </GroupBox>
@@ -468,8 +468,8 @@
                     Style="{StaticResource MaterialDesignCardGroupBox}">
             <smtx:XamlDisplay UniqueKey="calendar_5">
               <Calendar materialDesign:ElevationAssist.Elevation="Dp8"
-                        Style="{StaticResource MaterialDesignCalendarPortraitForeground}"
-                        IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}" />
+                        IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"
+                        Style="{StaticResource MaterialDesignCalendarPortraitForeground}" />
             </smtx:XamlDisplay>
           </GroupBox>
 
@@ -559,6 +559,26 @@
             </smtx:XamlDisplay>
           </GroupBox>
 
+          <GroupBox Margin="10"
+                    materialDesign:ColorZoneAssist.Mode="SecondaryMid"
+                    materialDesign:ElevationAssist.Elevation="Dp8"
+                    Header="MinuteSelectionStep"
+                    Style="{StaticResource MaterialDesignCardGroupBox}">
+            <StackPanel Margin="0,0,16,16">
+              <TextBlock Margin="0,0,0,8" Text="You can change the granularity of selectable times with the MinuteSelectionStep property." />
+              <ComboBox materialDesign:HintAssist.Hint="MinuteSelectionStep"
+                        ItemsSource="{Binding AvailableMinuteSelectionSteps}"
+                        SelectedItem="{Binding SelectedMinuteSelectionStep}"
+                        Style="{StaticResource MaterialDesignFilledComboBox}" />
+              <smtx:XamlDisplay UniqueKey="clock_13">
+                <materialDesign:Clock Width="auto"
+                                      Is24Hours="True"
+                                      MinuteSelectionStep="{Binding SelectedMinuteSelectionStep}"
+                                      Style="{StaticResource MaterialDesignClock}" />
+              </smtx:XamlDisplay>
+            </StackPanel>
+          </GroupBox>
+
         </WrapPanel>
       </Expander>
 
@@ -650,6 +670,8 @@
           </GroupBox>
 
 
+
+
         </WrapPanel>
       </Expander>
     </Grid>
diff --git a/src/MaterialDesign3.Demo.Wpf/Pickers.xaml.cs b/src/MaterialDesign3.Demo.Wpf/Pickers.xaml.cs
index a6658499a6..54e488cf57 100644
--- a/src/MaterialDesign3.Demo.Wpf/Pickers.xaml.cs
+++ b/src/MaterialDesign3.Demo.Wpf/Pickers.xaml.cs
@@ -1,6 +1,6 @@
 using System.Diagnostics;
 using System.Globalization;
-using MaterialDesign3Demo.Domain;
+using MaterialDesignDemo.Domain;
 using MaterialDesignThemes.Wpf;
 
 namespace MaterialDesign3Demo;
diff --git a/src/MaterialDesignDemo.Shared/Domain/PickersViewModel.cs b/src/MaterialDesignDemo.Shared/Domain/PickersViewModel.cs
new file mode 100644
index 0000000000..cc41371687
--- /dev/null
+++ b/src/MaterialDesignDemo.Shared/Domain/PickersViewModel.cs
@@ -0,0 +1,29 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace MaterialDesignDemo.Domain;
+
+public partial class PickersViewModel : ObservableObject
+{
+    [ObservableProperty]
+    private DateTime _date;
+    [ObservableProperty]
+    private DateTime _time;
+    [ObservableProperty]
+    private string? _validatingTime;
+    [ObservableProperty]
+    private DateTime? _futureValidatingDate;
+
+    public IReadOnlyList<int> AvailableMinuteSelectionSteps { get; }
+
+    [ObservableProperty]
+    private int _selectedMinuteSelectionStep;
+
+    public PickersViewModel()
+    {
+        Date = DateTime.Now;
+        Time = DateTime.Now;
+
+        AvailableMinuteSelectionSteps = [ 1, 2, 3, 4, 5, 6, 10, 12, 15, 20, 30, 60 ];
+        SelectedMinuteSelectionStep = 15;
+    }
+}

From 90799288b178e0fafaab824cc76e229cccb8cfe0 Mon Sep 17 00:00:00 2001
From: Corvin <43533385+corvinsz@users.noreply.github.com>
Date: Wed, 29 Apr 2026 19:21:51 +0200
Subject: [PATCH 5/7] refactor: use nameof keyword

---
 src/MaterialDesignThemes.Wpf/Clock.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/MaterialDesignThemes.Wpf/Clock.cs b/src/MaterialDesignThemes.Wpf/Clock.cs
index 12cf7aab44..76bc200961 100644
--- a/src/MaterialDesignThemes.Wpf/Clock.cs
+++ b/src/MaterialDesignThemes.Wpf/Clock.cs
@@ -249,7 +249,7 @@ private static void MinuteSelectionStepPropertyChangedCallback(DependencyObject
         if (step < 1 || step > 60 || 60 % step != 0)
             throw new ArgumentOutOfRangeException(
                 nameof(MinuteSelectionStep),
-                "MinuteSelectionStep must be a divisor of 60 and between 1 and 60.");
+                $"{nameof(MinuteSelectionStep)} must be a divisor of 60 and between 1 and 60.");
 
         clock.GenerateButtons();
     }

From 62aacf76a9c033b1d8bd172766f339e84d932462 Mon Sep 17 00:00:00 2001
From: Kevin Bost <kitokeboo@gmail.com>
Date: Thu, 30 Apr 2026 22:42:17 -0700
Subject: [PATCH 6/7] ```

refactor: move disabled clock button styling to XAML

This change consolidates the visual styling for disabled clock buttons into the XAML.
Moving the opacity setting from code-behind to the control's style improves the separation of concerns.
Additionally, updates button collection generation to use C# 12 collection expressions for improved conciseness.
```
---
 src/MaterialDesignThemes.Wpf/Clock.cs           | 17 ++++++-----------
 .../Themes/MaterialDesignTheme.Clock.xaml       |  3 +++
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/MaterialDesignThemes.Wpf/Clock.cs b/src/MaterialDesignThemes.Wpf/Clock.cs
index 76bc200961..ce0cf2ca3f 100644
--- a/src/MaterialDesignThemes.Wpf/Clock.cs
+++ b/src/MaterialDesignThemes.Wpf/Clock.cs
@@ -260,7 +260,6 @@ public int MinuteSelectionStep
         set => SetValue(MinuteSelectionStepProperty, value);
     }
 
-
     public static readonly RoutedEvent ClockChoiceMadeEvent =
         EventManager.RegisterRoutedEvent(
             "ClockChoiceMade",
@@ -324,15 +323,15 @@ private void GenerateButtons()
 
             if (Is24Hours)
             {
-                GenerateButtons(hoursCanvas, Enumerable.Range(13, 12).ToList(), ButtonRadiusRatio,
+                GenerateButtons(hoursCanvas, [.. Enumerable.Range(13, 12)], ButtonRadiusRatio,
                     new ClockItemIsCheckedConverter(() => Time, ClockDisplayMode.Hours, Is24Hours), i => "ButtonStyle", "00",
                     ClockDisplayMode.Hours);
-                GenerateButtons(hoursCanvas, Enumerable.Range(1, 12).ToList(), ButtonRadiusInnerRatio,
+                GenerateButtons(hoursCanvas, [.. Enumerable.Range(1, 12)], ButtonRadiusInnerRatio,
                     new ClockItemIsCheckedConverter(() => Time, ClockDisplayMode.Hours, Is24Hours), i => "ButtonStyle", "#",
                     ClockDisplayMode.Hours);
             }
             else
-                GenerateButtons(hoursCanvas, Enumerable.Range(1, 12).ToList(), ButtonRadiusRatio,
+                GenerateButtons(hoursCanvas, [.. Enumerable.Range(1, 12)], ButtonRadiusRatio,
                     new ClockItemIsCheckedConverter(() => Time, ClockDisplayMode.Hours, Is24Hours), i => "ButtonStyle", "0",
                     ClockDisplayMode.Hours);
         }
@@ -343,7 +342,7 @@ private void GenerateButtons()
 
             GenerateButtons(
                 minutesCanvas,
-                Enumerable.Range(1, 60).ToList(),
+                [.. Enumerable.Range(1, 60)],
                 ButtonRadiusRatio,
                 new ClockItemIsCheckedConverter(() => Time, ClockDisplayMode.Minutes, Is24Hours),
                 i => ((i / 5.0) % 1) == 0.0
@@ -358,7 +357,7 @@ private void GenerateButtons()
         {
             RemoveExistingButtons(secondsCanvas);
 
-            GenerateButtons(secondsCanvas, Enumerable.Range(1, 60).ToList(), ButtonRadiusRatio,
+            GenerateButtons(secondsCanvas, [.. Enumerable.Range(1, 60)], ButtonRadiusRatio,
                 new ClockItemIsCheckedConverter(() => Time, ClockDisplayMode.Seconds, Is24Hours),
                 i => ((i / 5.0) % 1) == 0.0 ? "ButtonStyle" : "LesserButtonStyle", "0",
                     ClockDisplayMode.Seconds);
@@ -387,7 +386,7 @@ private void HourReadOutPartNameOnPreviewMouseLeftButtonDown(object sender, Mous
 
     private void GenerateButtons(
         Panel canvas,
-        ICollection<int> range,
+        List<int> range,
         double radiusRatio,
         IValueConverter isCheckedConverter,
         Func<int, string> stylePropertySelector,
@@ -425,10 +424,6 @@ private void GenerateButtons(
             {
                 bool isEnabled = isEnabledSelector.Invoke(i);
                 button.IsEnabled = isEnabled;
-                if (!isEnabled)
-                {
-                    button.Opacity = 0.38;
-                }
             }
             canvas.Children.Add(button);
         }
diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Clock.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Clock.xaml
index 116583e896..2256a873cf 100644
--- a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Clock.xaml
+++ b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Clock.xaml
@@ -126,6 +126,9 @@
               <Setter Property="Background" Value="{DynamicResource MaterialDesign.Brush.Primary}" />
               <Setter Property="Foreground" Value="{DynamicResource MaterialDesign.Brush.Primary.Foreground}" />
             </Trigger>
+            <Trigger Property="IsEnabled" Value="False">
+              <Setter Property="Opacity" Value="0.38" />
+            </Trigger>
           </Style.Triggers>
         </Style>
       </Setter.Value>

From b236d8dbd04285851ca688d1c122b9c2c434922e Mon Sep 17 00:00:00 2001
From: Kevin Bost <kitokeboo@gmail.com>
Date: Thu, 30 Apr 2026 23:18:58 -0700
Subject: [PATCH 7/7] test(clock): remove outdated `MinuteSelectionStep` button
 enablement tests

These tests verified the enabled state and opacity of minute selection buttons based on the `MinuteSelectionStep` property. Following the refactor that moved disabled clock button styling to XAML, these tests are no longer relevant to code-behind logic.
---
 .../ClockTests.cs                             | 50 -------------------
 1 file changed, 50 deletions(-)

diff --git a/tests/MaterialDesignThemes.Wpf.Tests/ClockTests.cs b/tests/MaterialDesignThemes.Wpf.Tests/ClockTests.cs
index 9669aff9d1..88ca80992d 100644
--- a/tests/MaterialDesignThemes.Wpf.Tests/ClockTests.cs
+++ b/tests/MaterialDesignThemes.Wpf.Tests/ClockTests.cs
@@ -83,56 +83,6 @@ void OnTimeChanged(object? sender, TimeChangedEventArgs e)
         await Assert.That(invocations[1].NewTime).IsEqualTo(now + TimeSpan.FromMinutes(-2));
     }
 
-
-    [Test]
-    [Arguments(1)]
-    [Arguments(2)]
-    [Arguments(3)]
-    [Arguments(4)]
-    [Arguments(5)]
-    [Arguments(6)]
-    [Arguments(10)]
-    [Arguments(12)]
-    [Arguments(15)]
-    [Arguments(20)]
-    [Arguments(30)]
-    [Arguments(60)]
-    public async Task MinuteSelectionStep_WhenSet_OnlyMatchingMinuteButtonsAreEnabled(int minuteSelectionStep)
-    {
-        var clock = new Clock
-        {
-            MinuteSelectionStep = minuteSelectionStep
-        };
-
-        clock.ApplyDefaultStyle();
-
-        Canvas minutesCanvas = clock.FindVisualChild<Canvas>(Clock.MinutesCanvasPartName);
-        var minuteButtons = minutesCanvas.GetVisualChildren<ClockItemButton>();
-
-        foreach (var button in minuteButtons)
-        {
-            int value = int.Parse(button.Content!.ToString()!);
-
-            bool shouldBeEnabled = value % minuteSelectionStep == 0;
-
-            await Assert.That(button.IsEnabled).IsEqualTo(shouldBeEnabled);
-            await Assert.That(button.Opacity).IsEqualTo(shouldBeEnabled ? 1d : 0.38d);
-        }
-    }
-
-    [Test]
-    public async Task MinuteSelectionStep_Default_AllButtonsAreEnabled()
-    {
-        var clock = new Clock();
-
-        clock.ApplyDefaultStyle();
-
-        Canvas minutesCanvas = clock.FindVisualChild<Canvas>(Clock.MinutesCanvasPartName);
-        var minuteButtons = minutesCanvas.GetVisualChildren<ClockItemButton>();
-
-        await Assert.That(minuteButtons.All(x => x.IsEnabled)).IsTrue();
-    }
-
     [Test]
     public async Task MinuteSelectionStep_DefaultValue_IsOne()
     {