|
3 | 3 | xmlns:converters="clr-namespace:MaterialDesignThemes.Wpf.Converters" |
4 | 4 | xmlns:wpf="clr-namespace:MaterialDesignThemes.Wpf"> |
5 | 5 |
|
| 6 | + |
6 | 7 | <Style x:Key="MaterialDesignClockItemThumb" TargetType="{x:Type Thumb}"> |
7 | 8 | <Setter Property="Template"> |
8 | 9 | <Setter.Value> |
|
89 | 90 | </Style> |
90 | 91 |
|
91 | 92 | <Style x:Key="MaterialDesignClock" TargetType="{x:Type wpf:Clock}"> |
| 93 | + <Style.Resources> |
| 94 | + <converters:CornerRadiusCloneConverter x:Key="FixedBottomCornerRadiusConverter" |
| 95 | + FixedBottomLeft="0" |
| 96 | + FixedBottomRight="0" /> |
| 97 | + </Style.Resources> |
92 | 98 | <Setter Property="Background" Value="{DynamicResource MaterialDesign.Brush.Background}" /> |
93 | 99 | <Setter Property="BorderThickness" Value="1" /> |
94 | 100 | <Setter Property="ButtonRadiusInnerRatio" Value=".6" /> |
95 | 101 | <Setter Property="ButtonRadiusRatio" Value=".835" /> |
| 102 | + <Setter Property="CornerRadius" Value="2"/> |
96 | 103 | <Setter Property="ButtonStyle"> |
97 | 104 | <Setter.Value> |
98 | 105 | <Style TargetType="{x:Type wpf:ClockItemButton}"> |
|
180 | 187 | <Border Background="{TemplateBinding Background}" |
181 | 188 | BorderBrush="{TemplateBinding BorderBrush}" |
182 | 189 | BorderThickness="{TemplateBinding BorderThickness}" |
183 | | - CornerRadius="2"> |
| 190 | + CornerRadius="{TemplateBinding CornerRadius}"> |
184 | 191 | <VisualStateManager.VisualStateGroups> |
185 | 192 | <VisualStateGroup x:Name="DisplayModeStates"> |
186 | 193 | <VisualStateGroup.Transitions> |
|
621 | 628 | <Border Height="120" |
622 | 629 | Margin="0,0,0,12" |
623 | 630 | Background="{DynamicResource MaterialDesign.Brush.Primary}" |
624 | | - CornerRadius="2 2 0 0" |
| 631 | + CornerRadius="{TemplateBinding CornerRadius, Converter={StaticResource FixedBottomCornerRadiusConverter}}" |
625 | 632 | Visibility="{TemplateBinding IsHeaderVisible, Converter={x:Static converters:BooleanToVisibilityConverter.CollapsedInstance}}"> |
626 | 633 | <StackPanel x:Name="TimeReadoutStackPanel" |
627 | 634 | Margin="24" |
|
855 | 862 | <Setter Property="BorderThickness" Value="1" /> |
856 | 863 | <Setter Property="ButtonRadiusInnerRatio" Value=".6" /> |
857 | 864 | <Setter Property="ButtonRadiusRatio" Value=".835" /> |
| 865 | + <Setter Property="CornerRadius" Value="2"/> |
858 | 866 | <Setter Property="ButtonStyle"> |
859 | 867 | <Setter.Value> |
860 | 868 | <Style TargetType="{x:Type wpf:ClockItemButton}"> |
|
940 | 948 | <Border Background="{TemplateBinding Background}" |
941 | 949 | BorderBrush="{TemplateBinding BorderBrush}" |
942 | 950 | BorderThickness="{TemplateBinding BorderThickness}" |
943 | | - CornerRadius="2"> |
| 951 | + CornerRadius="{TemplateBinding CornerRadius}"> |
944 | 952 | <VisualStateManager.VisualStateGroups> |
945 | 953 | <VisualStateGroup x:Name="DisplayModeStates"> |
946 | 954 | <VisualStateGroup.Transitions> |
|
1762 | 1770 | <Border Background="{TemplateBinding Background}" |
1763 | 1771 | BorderBrush="{TemplateBinding BorderBrush}" |
1764 | 1772 | BorderThickness="{TemplateBinding BorderThickness}" |
1765 | | - CornerRadius="2"> |
| 1773 | + CornerRadius="{TemplateBinding CornerRadius}"> |
1766 | 1774 | <VisualStateManager.VisualStateGroups> |
1767 | 1775 | <VisualStateGroup x:Name="DisplayModeStates"> |
1768 | 1776 | <VisualStateGroup.Transitions> |
|
2577 | 2585 | <Border Background="{TemplateBinding Background}" |
2578 | 2586 | BorderBrush="{TemplateBinding BorderBrush}" |
2579 | 2587 | BorderThickness="{TemplateBinding BorderThickness}" |
2580 | | - CornerRadius="2"> |
| 2588 | + CornerRadius="{TemplateBinding CornerRadius}"> |
2581 | 2589 | <VisualStateManager.VisualStateGroups> |
2582 | 2590 | <VisualStateGroup x:Name="DisplayModeStates"> |
2583 | 2591 | <VisualStateGroup.Transitions> |
|
3398 | 3406 | <Border Background="{TemplateBinding Background}" |
3399 | 3407 | BorderBrush="{TemplateBinding BorderBrush}" |
3400 | 3408 | BorderThickness="{TemplateBinding BorderThickness}" |
3401 | | - CornerRadius="2"> |
| 3409 | + CornerRadius="{TemplateBinding CornerRadius}"> |
3402 | 3410 | <VisualStateManager.VisualStateGroups> |
3403 | 3411 | <VisualStateGroup x:Name="DisplayModeStates"> |
3404 | 3412 | <VisualStateGroup.Transitions> |
|
0 commit comments