From c963262d309a0aa7bf0f9fa1fcc6c15e6fecc341 Mon Sep 17 00:00:00 2001
From: Corvin <43533385+corvinsz@users.noreply.github.com>
Date: Tue, 26 May 2026 18:30:34 +0200
Subject: [PATCH 1/4] fix: Support CornerRadius in Clock control

---
 .../Themes/MaterialDesignTheme.Clock.xaml        | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Clock.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Clock.xaml
index 2256a873cf..f924de7621 100644
--- a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Clock.xaml
+++ b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Clock.xaml
@@ -3,6 +3,10 @@
                     xmlns:converters="clr-namespace:MaterialDesignThemes.Wpf.Converters"
                     xmlns:wpf="clr-namespace:MaterialDesignThemes.Wpf">
 
+  <converters:CornerRadiusCloneConverter x:Key="FixedBottomCornerRadiusConverter"
+                                         FixedBottomLeft="2"
+                                         FixedBottomRight="2" />
+
   <Style x:Key="MaterialDesignClockItemThumb" TargetType="{x:Type Thumb}">
     <Setter Property="Template">
       <Setter.Value>
@@ -180,7 +184,7 @@
           <Border Background="{TemplateBinding Background}"
                   BorderBrush="{TemplateBinding BorderBrush}"
                   BorderThickness="{TemplateBinding BorderThickness}"
-                  CornerRadius="2">
+                  CornerRadius="{TemplateBinding CornerRadius}">
             <VisualStateManager.VisualStateGroups>
               <VisualStateGroup x:Name="DisplayModeStates">
                 <VisualStateGroup.Transitions>
@@ -621,7 +625,7 @@
               <Border Height="120"
                       Margin="0,0,0,12"
                       Background="{DynamicResource MaterialDesign.Brush.Primary}"
-                      CornerRadius="2 2 0 0"
+                      CornerRadius="{TemplateBinding CornerRadius, Converter={StaticResource FixedBottomCornerRadiusConverter}}"
                       Visibility="{TemplateBinding IsHeaderVisible, Converter={x:Static converters:BooleanToVisibilityConverter.CollapsedInstance}}">
                 <StackPanel x:Name="TimeReadoutStackPanel"
                             Margin="24"
@@ -940,7 +944,7 @@
           <Border Background="{TemplateBinding Background}"
                   BorderBrush="{TemplateBinding BorderBrush}"
                   BorderThickness="{TemplateBinding BorderThickness}"
-                  CornerRadius="2">
+                  CornerRadius="{TemplateBinding CornerRadius}">
             <VisualStateManager.VisualStateGroups>
               <VisualStateGroup x:Name="DisplayModeStates">
                 <VisualStateGroup.Transitions>
@@ -1762,7 +1766,7 @@
           <Border Background="{TemplateBinding Background}"
                   BorderBrush="{TemplateBinding BorderBrush}"
                   BorderThickness="{TemplateBinding BorderThickness}"
-                  CornerRadius="2">
+                  CornerRadius="{TemplateBinding CornerRadius}">
             <VisualStateManager.VisualStateGroups>
               <VisualStateGroup x:Name="DisplayModeStates">
                 <VisualStateGroup.Transitions>
@@ -2577,7 +2581,7 @@
           <Border Background="{TemplateBinding Background}"
                   BorderBrush="{TemplateBinding BorderBrush}"
                   BorderThickness="{TemplateBinding BorderThickness}"
-                  CornerRadius="2">
+                  CornerRadius="{TemplateBinding CornerRadius}">
             <VisualStateManager.VisualStateGroups>
               <VisualStateGroup x:Name="DisplayModeStates">
                 <VisualStateGroup.Transitions>
@@ -3398,7 +3402,7 @@
           <Border Background="{TemplateBinding Background}"
                   BorderBrush="{TemplateBinding BorderBrush}"
                   BorderThickness="{TemplateBinding BorderThickness}"
-                  CornerRadius="2">
+                  CornerRadius="{TemplateBinding CornerRadius}">
             <VisualStateManager.VisualStateGroups>
               <VisualStateGroup x:Name="DisplayModeStates">
                 <VisualStateGroup.Transitions>

From 2cc5af766073f7081563d07294b28f20db953e7d Mon Sep 17 00:00:00 2001
From: Corvin <43533385+corvinsz@users.noreply.github.com>
Date: Tue, 26 May 2026 18:32:57 +0200
Subject: [PATCH 2/4] fix: adjust fixed CornerRadius values

---
 .../Themes/MaterialDesignTheme.Clock.xaml                     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Clock.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Clock.xaml
index f924de7621..05fa0fc1c9 100644
--- a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Clock.xaml
+++ b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Clock.xaml
@@ -4,8 +4,8 @@
                     xmlns:wpf="clr-namespace:MaterialDesignThemes.Wpf">
 
   <converters:CornerRadiusCloneConverter x:Key="FixedBottomCornerRadiusConverter"
-                                         FixedBottomLeft="2"
-                                         FixedBottomRight="2" />
+                                         FixedBottomLeft="0"
+                                         FixedBottomRight="0" />
 
   <Style x:Key="MaterialDesignClockItemThumb" TargetType="{x:Type Thumb}">
     <Setter Property="Template">

From 7ef1c8903e8b7449888377dfe4ba4b84fe280873 Mon Sep 17 00:00:00 2001
From: Corvin <43533385+corvinsz@users.noreply.github.com>
Date: Wed, 27 May 2026 18:10:49 +0200
Subject: [PATCH 3/4] fix: set default CornerRadius value on missin Clock
 styles

---
 .../Themes/MaterialDesignTheme.Clock.xaml                       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Clock.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Clock.xaml
index 05fa0fc1c9..97714f345c 100644
--- a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Clock.xaml
+++ b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Clock.xaml
@@ -97,6 +97,7 @@
     <Setter Property="BorderThickness" Value="1" />
     <Setter Property="ButtonRadiusInnerRatio" Value=".6" />
     <Setter Property="ButtonRadiusRatio" Value=".835" />
+    <Setter Property="CornerRadius" Value="2"/>
     <Setter Property="ButtonStyle">
       <Setter.Value>
         <Style TargetType="{x:Type wpf:ClockItemButton}">
@@ -859,6 +860,7 @@
     <Setter Property="BorderThickness" Value="1" />
     <Setter Property="ButtonRadiusInnerRatio" Value=".6" />
     <Setter Property="ButtonRadiusRatio" Value=".835" />
+    <Setter Property="CornerRadius" Value="2"/>
     <Setter Property="ButtonStyle">
       <Setter.Value>
         <Style TargetType="{x:Type wpf:ClockItemButton}">

From 04d1f0309f86372a8701279e256a37d3c3fe67d0 Mon Sep 17 00:00:00 2001
From: Corvin <43533385+corvinsz@users.noreply.github.com>
Date: Wed, 27 May 2026 18:39:33 +0200
Subject: [PATCH 4/4] refactor: move converter declaration into style resources

---
 .../Themes/MaterialDesignTheme.Clock.xaml              | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Clock.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Clock.xaml
index 97714f345c..d36a94ec1b 100644
--- a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Clock.xaml
+++ b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Clock.xaml
@@ -3,10 +3,7 @@
                     xmlns:converters="clr-namespace:MaterialDesignThemes.Wpf.Converters"
                     xmlns:wpf="clr-namespace:MaterialDesignThemes.Wpf">
 
-  <converters:CornerRadiusCloneConverter x:Key="FixedBottomCornerRadiusConverter"
-                                         FixedBottomLeft="0"
-                                         FixedBottomRight="0" />
-
+  
   <Style x:Key="MaterialDesignClockItemThumb" TargetType="{x:Type Thumb}">
     <Setter Property="Template">
       <Setter.Value>
@@ -93,6 +90,11 @@
   </Style>
 
   <Style x:Key="MaterialDesignClock" TargetType="{x:Type wpf:Clock}">
+    <Style.Resources>
+      <converters:CornerRadiusCloneConverter x:Key="FixedBottomCornerRadiusConverter"
+                                             FixedBottomLeft="0"
+                                             FixedBottomRight="0" />
+    </Style.Resources>
     <Setter Property="Background" Value="{DynamicResource MaterialDesign.Brush.Background}" />
     <Setter Property="BorderThickness" Value="1" />
     <Setter Property="ButtonRadiusInnerRatio" Value=".6" />