From 51dc61376eba05af7e72f221a59e151af5130b21 Mon Sep 17 00:00:00 2001
From: Vic <10308169+VictoriousRaptor@users.noreply.github.com>
Date: Sun, 20 Nov 2022 13:56:36 +0800
Subject: [PATCH] revert displaying current time in date/time format dropdown

---
 Flow.Launcher/SettingWindow.xaml              | 15 ++----------
 .../ViewModel/SettingWindowViewModel.cs       | 24 +++++++++----------
 2 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index e078cb6e2..aa390b885 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -44,7 +44,6 @@
         <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
         <converters:TextConverter x:Key="TextConverter" />
         <converters:TranlationConverter x:Key="TranlationConverter" />
-        <converters:DateTimeFormatToNowConverter x:Key="DateTimeFormatToNowConverter"></converters:DateTimeFormatToNowConverter>
         <CollectionViewSource x:Key="SortedFonts" Source="{Binding Source={x:Static Fonts.SystemFontFamilies}}">
             <CollectionViewSource.SortDescriptions>
                 <scm:SortDescription PropertyName="Source" />
@@ -2181,12 +2180,7 @@
                                                                 VerticalAlignment="Center"
                                                                 FontSize="14"
                                                                 ItemsSource="{Binding TimeFormatList}"
-                                                                SelectedIndex="{Binding TimeFormat}">
-                                                                <ItemsControl.ItemTemplate>
-                                                                    <DataTemplate>
-                                                                        <TextBlock Text="{Binding Converter={StaticResource DateTimeFormatToNowConverter}}"/>
-                                                                    </DataTemplate>
-                                                                </ItemsControl.ItemTemplate>
+                                                                SelectedItem="{Binding TimeFormat}">
                                                             </ComboBox>
                                                             <ui:ToggleSwitch
                                                                 IsOn="{Binding UseClock, Mode=TwoWay}"
@@ -2223,12 +2217,7 @@
                                                                 VerticalAlignment="Center"
                                                                 FontSize="14"
                                                                 ItemsSource="{Binding DateFormatList}"
-                                                                SelectedIndex="{Binding DateFormat}">
-                                                                <ItemsControl.ItemTemplate>
-                                                                    <DataTemplate>
-                                                                        <TextBlock Text="{Binding Converter={StaticResource DateTimeFormatToNowConverter}}"/>
-                                                                    </DataTemplate>
-                                                                </ItemsControl.ItemTemplate>
+                                                                SelectedItem="{Binding DateFormat}">
                                                             </ComboBox>
                                                             <ui:ToggleSwitch
                                                                 IsOn="{Binding UseDate, Mode=TwoWay}"
diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
index 7feb8bd01..78c82bee6 100644
--- a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
+++ b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
@@ -47,6 +47,14 @@ namespace Flow.Launcher.ViewModel
                     case nameof(Settings.WindowSize):
                         OnPropertyChanged(nameof(WindowWidthSize));
                         break;
+                    case nameof(Settings.UseDate):
+                    case nameof(Settings.DateFormat):
+                        OnPropertyChanged(nameof(DateText));
+                        break;
+                    case nameof(Settings.UseClock):
+                    case nameof(Settings.TimeFormat):
+                        OnPropertyChanged(nameof(ClockText));
+                        break;
                 }
             };
         }
@@ -483,26 +491,18 @@ namespace Flow.Launcher.ViewModel
         public string TimeFormat
         {
             get { return Settings.TimeFormat; }
-            set
-            {
-                Settings.TimeFormat = value;
-                OnPropertyChanged();
-            }
+            set { Settings.TimeFormat = value; }
         }
 
         public string DateFormat
         {
             get { return Settings.DateFormat; }
-            set
-            {
-                Settings.DateFormat = value;
-                OnPropertyChanged();
-            }
+            set { Settings.DateFormat = value; }
         }
 
-        public string ClockText { get; private set; }
+        public string ClockText => DateTime.Now.ToString(TimeFormat);
 
-        public string DateText { get; private set; }
+        public string DateText => DateTime.Now.ToString(DateFormat);
 
 
         public double WindowWidthSize