Skip to content

Support CornerRadius in Clock control #4054

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
corvinsz wants to merge 4 commits into
base: master
Choose a base branch
from
+14 −6
Open

Support CornerRadius in Clock control #4054

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c963262
fix: Support CornerRadius in Clock control
corvinsz May 26, 2026
2cc5af7
fix: adjust fixed CornerRadius values
corvinsz May 26, 2026
7ef1c89
fix: set default CornerRadius value on missin Clock styles
corvinsz May 27, 2026
04d1f03
refactor: move converter declaration into style resources
corvinsz May 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Clock.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
xmlns:converters="clr-namespace:MaterialDesignThemes.Wpf.Converters"
xmlns:wpf="clr-namespace:MaterialDesignThemes.Wpf">


<Style x:Key="MaterialDesignClockItemThumb" TargetType="{x:Type Thumb}">
<Setter Property="Template">
<Setter.Value>
Expand Down Expand Up @@ -89,10 +90,16 @@
</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" />
<Setter Property="ButtonRadiusRatio" Value=".835" />
<Setter Property="CornerRadius" Value="2"/>
<Setter Property="ButtonStyle">
<Setter.Value>
<Style TargetType="{x:Type wpf:ClockItemButton}">
Expand Down Expand Up @@ -180,7 +187,7 @@
<Border Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="2">
CornerRadius="{TemplateBinding CornerRadius}">
<VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="DisplayModeStates">
<VisualStateGroup.Transitions>
Expand Down Expand Up @@ -621,7 +628,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"
Expand Down Expand Up @@ -855,6 +862,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}">
Expand Down Expand Up @@ -940,7 +948,7 @@
<Border Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="2">
CornerRadius="{TemplateBinding CornerRadius}">
<VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="DisplayModeStates">
<VisualStateGroup.Transitions>
Expand Down Expand Up @@ -1762,7 +1770,7 @@
<Border Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="2">
CornerRadius="{TemplateBinding CornerRadius}">
<VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="DisplayModeStates">
<VisualStateGroup.Transitions>
Expand Down Expand Up @@ -2577,7 +2585,7 @@
<Border Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="2">
CornerRadius="{TemplateBinding CornerRadius}">
<VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="DisplayModeStates">
<VisualStateGroup.Transitions>
Expand Down Expand Up @@ -3398,7 +3406,7 @@
<Border Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="2">
CornerRadius="{TemplateBinding CornerRadius}">
<VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="DisplayModeStates">
<VisualStateGroup.Transitions>
Expand Down
Loading