From 4bb6ea92ec672230b458c1dcc4741ae73ccdb480 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Thu, 1 Sep 2022 11:08:04 +0900
Subject: [PATCH] - Adjust Alignment and color

---
 Flow.Launcher/MainWindow.xaml    |  3 ++-
 Flow.Launcher/MainWindow.xaml.cs |  4 ++--
 Flow.Launcher/Themes/Base.xaml   | 16 ++++++++++------
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml
index 08a0c7309..bc1dda0e5 100644
--- a/Flow.Launcher/MainWindow.xaml
+++ b/Flow.Launcher/MainWindow.xaml
@@ -192,11 +192,12 @@
                             </ContextMenu>
                         </TextBox.ContextMenu>
                     </TextBox>
+
                     <StackPanel x:Name="ClockPanel" Style="{DynamicResource ClockPanel}">
                         <TextBlock x:Name="DateBox" Style="{DynamicResource DateBox}" />
                         <TextBlock x:Name="ClockBox" Style="{DynamicResource ClockBox}" />
-
                     </StackPanel>
+
                     <Canvas Style="{DynamicResource SearchIconPosition}">
                         <Image
                             x:Name="PluginActivationIcon"
diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index 5b7cb88df..1fcccd8d2 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -71,11 +71,11 @@ namespace Flow.Launcher
             {
                 ClockBox.Visibility = Visibility.Collapsed;
             }
-            if (_settings.UseDate == false)
+            if (_settings.UseDate == true)
             {
                 DateBox.Text = System.DateTime.Now.ToString("MM/dd ddd");
             }
-            else if (_settings.UseDate == true)
+            else if (_settings.UseDate == false)
             {
                 DateBox.Visibility = Visibility.Collapsed;
             }
diff --git a/Flow.Launcher/Themes/Base.xaml b/Flow.Launcher/Themes/Base.xaml
index 3e4f44d2f..a37a140b4 100644
--- a/Flow.Launcher/Themes/Base.xaml
+++ b/Flow.Launcher/Themes/Base.xaml
@@ -79,6 +79,8 @@
         <Setter Property="Stroke" Value="Blue" />
     </Style>
 
+    <Style x:Key="BaseClockPosition" TargetType="{x:Type Canvas}" />
+
     <Style x:Key="BaseClockPanel" TargetType="{x:Type StackPanel}">
         <Setter Property="Orientation" Value="Horizontal" />
         <Setter Property="HorizontalAlignment" Value="Right" />
@@ -88,29 +90,31 @@
         <Setter Property="Visibility" Value="Collapsed" />
     </Style>
     <Style x:Key="BaseClockBox" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="20" />
+        <Setter Property="FontSize" Value="22" />
         <Setter Property="Foreground" Value="#8f8f8f" />
+        <Setter Property="HorizontalAlignment" Value="Right" />
         <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="Margin" Value="10,0,0,0" />
+        <Setter Property="Margin" Value="0,0,2,0" />
     </Style>
     <Style x:Key="BaseDateBox" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="14" />
+        <Setter Property="FontSize" Value="16" />
         <Setter Property="Foreground" Value="#8f8f8f" />
+        <Setter Property="HorizontalAlignment" Value="Right" />
         <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="Margin" Value="0,0,0,0" />
+        <Setter Property="Margin" Value="0,0,10,0" />
     </Style>
 
     <Style
         x:Key="ClockBox"
         BasedOn="{StaticResource BaseClockBox}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#8f8f8f" />
+        <Setter Property="Foreground" Value="#C6C6C6" />
     </Style>
     <Style
         x:Key="DateBox"
         BasedOn="{StaticResource BaseDateBox}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#8f8f8f" />
+        <Setter Property="Foreground" Value="#C6C6C6" />
     </Style>
     <Style
         x:Key="ClockPanel"