From cb3d219bc5329fcb8ef7153e540cc5178ba594d1 Mon Sep 17 00:00:00 2001
From: QyQj <ejyimy@outlook.com>
Date: Tue, 8 Nov 2022 10:29:43 +0800
Subject: [PATCH] enhancement: Allow DateTimePicker to choose to use Clock or
 ListClock

---
 .../Controls/Input/DateTimePicker.cs          | 19 +++++
 .../Controls/Time/CalendarWithClock.cs        | 70 ++++++++++++++++---
 .../Data/Enum/ClockType.cs                    |  8 +++
 .../HandyControl_Shared/Data/ResourceToken.cs |  2 +
 .../HandyControl_Shared.projitems             |  1 +
 .../Themes/Styles/Clock.xaml                  | 38 +++++++++-
 .../HandyControl_Shared/Themes/Theme.xaml     | 36 ++++++++++
 7 files changed, 165 insertions(+), 9 deletions(-)
 create mode 100644 src/Shared/HandyControl_Shared/Data/Enum/ClockType.cs

diff --git a/src/Shared/HandyControl_Shared/Controls/Input/DateTimePicker.cs b/src/Shared/HandyControl_Shared/Controls/Input/DateTimePicker.cs
index 51ab33e3d..95f22253f 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/DateTimePicker.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/DateTimePicker.cs
@@ -9,6 +9,7 @@
 using System.Windows.Media;
 using System.Windows.Threading;
 using HandyControl.Data;
+using HandyControl.Data.Enum;
 using HandyControl.Interactivity;
 
 namespace HandyControl.Controls;
@@ -92,6 +93,24 @@ public DateTimePicker()
 
     #region Public Properties
 
+    public static readonly DependencyProperty ClockTypeProperty = DependencyProperty.Register(
+        nameof(ClockType),
+        typeof(ClockType),
+        typeof(DateTimePicker),
+        new PropertyMetadata(ClockType.Clock, ClockStyleChanged));
+
+    private static void ClockStyleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var dp = (DateTimePicker) d;
+        dp._calendarWithClock.ClockType = (ClockType) e.NewValue;
+    }
+
+    public ClockType ClockType
+    {
+        get { return (ClockType) GetValue(ClockTypeProperty); }
+        set { SetValue(ClockTypeProperty, value); }
+    }
+
     public static readonly DependencyProperty DateTimeFormatProperty = DependencyProperty.Register(
         nameof(DateTimeFormat), typeof(string), typeof(DateTimePicker), new PropertyMetadata("yyyy-MM-dd HH:mm:ss"));
 
diff --git a/src/Shared/HandyControl_Shared/Controls/Time/CalendarWithClock.cs b/src/Shared/HandyControl_Shared/Controls/Time/CalendarWithClock.cs
index 70e8d2a85..bdc378bda 100644
--- a/src/Shared/HandyControl_Shared/Controls/Time/CalendarWithClock.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Time/CalendarWithClock.cs
@@ -5,6 +5,8 @@
 using System.Windows.Input;
 using System.Windows.Media;
 using HandyControl.Data;
+using HandyControl.Data.Enum;
+using HandyControl.Tools;
 
 namespace HandyControl.Controls;
 
@@ -29,7 +31,7 @@ public class CalendarWithClock : Control
 
     private ContentPresenter _calendarPresenter;
 
-    private Clock _clock;
+    private ClockBase _clock;
 
     private Calendar _calendar;
 
@@ -72,6 +74,25 @@ public CalendarWithClock()
 
     #region Public Properties
 
+    public static readonly DependencyProperty ClockTypeProperty = DependencyProperty.Register(
+        nameof(ClockType),
+        typeof(ClockType),
+        typeof(CalendarWithClock),
+        new PropertyMetadata(ClockType.Clock, ClockStyleChanged));
+
+    private static void ClockStyleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var dp = (CalendarWithClock) d;
+        dp.ClockType = (ClockType) e.NewValue;
+        dp.InitClock();
+    }
+
+    public ClockType ClockType
+    {
+        get { return (ClockType) GetValue(ClockTypeProperty); }
+        set { SetValue(ClockTypeProperty, value); }
+    }
+
     public static readonly DependencyProperty DateTimeFormatProperty = DependencyProperty.Register(
         nameof(DateTimeFormat), typeof(string), typeof(CalendarWithClock), new PropertyMetadata("yyyy-MM-dd HH:mm:ss"));
 
@@ -214,13 +235,7 @@ private void ButtonConfirm_OnClick(object sender, RoutedEventArgs e)
 
     private void InitCalendarAndClock()
     {
-        _clock = new Clock
-        {
-            BorderThickness = new Thickness(),
-            Background = Brushes.Transparent
-        };
-        TitleElement.SetBackground(_clock, Brushes.Transparent);
-        _clock.DisplayTimeChanged += Clock_DisplayTimeChanged;
+        InitClock();
 
         _calendar = new Calendar
         {
@@ -232,6 +247,45 @@ private void InitCalendarAndClock()
         _calendar.SelectedDatesChanged += Calendar_SelectedDatesChanged;
     }
 
+    private void InitClock()
+    {
+        if (_clock != null)
+        {
+            _clock.DisplayTimeChanged -= Clock_DisplayTimeChanged;
+        }
+
+        switch (ClockType)
+        {
+            case ClockType.Clock:
+                _clock = new Clock
+                {
+                    BorderThickness = new Thickness(),
+                    Background = Brushes.Transparent
+                };
+                break;
+
+            case ClockType.ListClock:
+                _clock = new ListClock
+                {
+                    BorderThickness = new Thickness(),
+                    Background = Brushes.Transparent,
+                    Style = ResourceHelper.GetResourceInternal<Style>(ResourceToken.ListClockForCalendarWithClockStyle)
+                };
+                break;
+
+            default:
+                _clock = new Clock
+                {
+                    BorderThickness = new Thickness(),
+                    Background = Brushes.Transparent
+                };
+                break;
+        }
+
+        TitleElement.SetBackground(_clock, Brushes.Transparent);
+        _clock.DisplayTimeChanged += Clock_DisplayTimeChanged;
+    }
+
     private void Calendar_SelectedDatesChanged(object sender, SelectionChangedEventArgs e)
     {
         Mouse.Capture(null);
diff --git a/src/Shared/HandyControl_Shared/Data/Enum/ClockType.cs b/src/Shared/HandyControl_Shared/Data/Enum/ClockType.cs
new file mode 100644
index 000000000..ac3a17339
--- /dev/null
+++ b/src/Shared/HandyControl_Shared/Data/Enum/ClockType.cs
@@ -0,0 +1,8 @@
+namespace HandyControl.Data.Enum
+{
+    public enum ClockType
+    {
+        Clock,
+        ListClock
+    }
+}
diff --git a/src/Shared/HandyControl_Shared/Data/ResourceToken.cs b/src/Shared/HandyControl_Shared/Data/ResourceToken.cs
index 21e929a55..673be49b0 100644
--- a/src/Shared/HandyControl_Shared/Data/ResourceToken.cs
+++ b/src/Shared/HandyControl_Shared/Data/ResourceToken.cs
@@ -370,5 +370,7 @@ public class ResourceToken
 
     internal const string ComboBoxItemCapsuleVerticalLast = nameof(ComboBoxItemCapsuleVerticalLast);
 
+    internal const string ListClockForCalendarWithClockStyle = nameof(ListClockForCalendarWithClockStyle);
+
     #endregion
 }
diff --git a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
index bac2ffb42..a7755e4ac 100644
--- a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
+++ b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
@@ -93,6 +93,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Tag\TagContainer.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Text\HighlightTextBlock.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Text\SimpleText.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Data\Enum\ClockType.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Data\Enum\GrowlShowMode.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Data\Enum\LinearLayout.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\EventToCommand.cs" />
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Clock.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Clock.xaml
index 28d70e11e..0d5a48c52 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Clock.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Clock.xaml
@@ -170,5 +170,41 @@
     </Style>
 
     <Style TargetType="hc:ListClock" BasedOn="{StaticResource ListClockBaseStyle}"/>
-    
+
+    <Style x:Key="ListClockForCalendarWithClockStyle" BasedOn="{StaticResource ListClockBaseStyle}" TargetType="hc:ListClock">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="hc:ListClock">
+                    <hc:SimplePanel Margin="0,4,0,8" HorizontalAlignment="Center" VerticalAlignment="Top">
+                        <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" Effect="{StaticResource EffectShadow2}" />
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition />
+                            </Grid.RowDefinitions>
+                            <Border Height="50">
+                                <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="20" Foreground="White" Text="{Binding DisplayTime, RelativeSource={RelativeSource TemplatedParent}, StringFormat={}{0:HH:mm:ss}}" TextAlignment="Center" />
+                            </Border>
+                            <Grid Grid.Row="1" Width="210" Margin="0,20">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                </Grid.ColumnDefinitions>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition />
+                                    <RowDefinition Height="Auto" />
+                                </Grid.RowDefinitions>
+                                <ListBox x:Name="PART_HourList" Padding="0" hc:BorderElement.CornerRadius="0" Style="{StaticResource ClockListBoxStyle}" />
+                                <ListBox x:Name="PART_MinuteList" Grid.Row="0" Grid.Column="1" Padding="0" hc:BorderElement.CornerRadius="0" BorderThickness="1,0" Style="{StaticResource ClockListBoxStyle}" />
+                                <ListBox x:Name="PART_SecondList" Grid.Row="0" Grid.Column="2" Padding="0" hc:BorderElement.CornerRadius="0" Style="{StaticResource ClockListBoxStyle}" />
+                                <Border Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="3" Height="1" VerticalAlignment="Bottom" Background="{DynamicResource BorderBrush}" Visibility="{Binding Visibility, ElementName=PART_ButtonConfirm}" />
+                                <Button Name="PART_ButtonConfirm" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3" Margin="0,10" HorizontalAlignment="Center" Background="Transparent" Content="{ex:Lang Key={x:Static langs:LangKeys.Confirm}}" Foreground="{DynamicResource PrimaryBrush}" Style="{StaticResource ButtonCustom}" Visibility="Collapsed" />
+                            </Grid>
+                        </Grid>
+                    </hc:SimplePanel>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 </ResourceDictionary>
diff --git a/src/Shared/HandyControl_Shared/Themes/Theme.xaml b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
index fe60ec51e..6141f156e 100644
--- a/src/Shared/HandyControl_Shared/Themes/Theme.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
@@ -12862,6 +12862,42 @@
 		</Setter>
 	</Style>
 	<Style TargetType="hc:ListClock" BasedOn="{StaticResource ListClockBaseStyle}" />
+	<Style x:Key="ListClockForCalendarWithClockStyle" BasedOn="{StaticResource ListClockBaseStyle}" TargetType="hc:ListClock">
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:ListClock">
+					<hc:SimplePanel Margin="0,4,0,8" HorizontalAlignment="Center" VerticalAlignment="Top">
+						<Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" Effect="{StaticResource EffectShadow2}" />
+						<Grid>
+							<Grid.RowDefinitions>
+								<RowDefinition Height="Auto" />
+								<RowDefinition />
+							</Grid.RowDefinitions>
+							<Border Height="50">
+								<TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="20" Foreground="White" Text="{Binding DisplayTime, RelativeSource={RelativeSource TemplatedParent}, StringFormat={}{0:HH:mm:ss}}" TextAlignment="Center" />
+							</Border>
+							<Grid Grid.Row="1" Width="210" Margin="0,20">
+								<Grid.ColumnDefinitions>
+									<ColumnDefinition />
+									<ColumnDefinition />
+									<ColumnDefinition />
+								</Grid.ColumnDefinitions>
+								<Grid.RowDefinitions>
+									<RowDefinition />
+									<RowDefinition Height="Auto" />
+								</Grid.RowDefinitions>
+								<ListBox x:Name="PART_HourList" Padding="0" hc:BorderElement.CornerRadius="0" Style="{StaticResource ClockListBoxStyle}" />
+								<ListBox x:Name="PART_MinuteList" Grid.Row="0" Grid.Column="1" Padding="0" hc:BorderElement.CornerRadius="0" BorderThickness="1,0" Style="{StaticResource ClockListBoxStyle}" />
+								<ListBox x:Name="PART_SecondList" Grid.Row="0" Grid.Column="2" Padding="0" hc:BorderElement.CornerRadius="0" Style="{StaticResource ClockListBoxStyle}" />
+								<Border Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="3" Height="1" VerticalAlignment="Bottom" Background="{DynamicResource BorderBrush}" Visibility="{Binding Visibility, ElementName=PART_ButtonConfirm}" />
+								<Button Name="PART_ButtonConfirm" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3" Margin="0,10" HorizontalAlignment="Center" Background="Transparent" Content="{ex:Lang Key={x:Static langs:LangKeys.Confirm}}" Foreground="{DynamicResource PrimaryBrush}" Style="{StaticResource ButtonCustom}" Visibility="Collapsed" />
+							</Grid>
+						</Grid>
+					</hc:SimplePanel>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
 	<Style BasedOn="{StaticResource ColorPickerBaseStyle}" TargetType="hc:ColorPicker" />
 	<Style BasedOn="{StaticResource ContextMenuBaseStyle}" TargetType="ContextMenu" />
 	<Style x:Key="ContextMenu.Small" BasedOn="{StaticResource ContextMenuBaseStyle}" TargetType="ContextMenu">