From c9bb1c2fadcf26f33fb8131088a55c1a01144604 Mon Sep 17 00:00:00 2001
From: liufei <demoliu94@163.com>
Date: Mon, 10 Jan 2022 11:50:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A0=B7=E5=BC=8F=E7=BB=86?=
 =?UTF-8?q?=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Control/Windows/ToDoInfoWindow.xaml | 17 +++++++++++------
 MainWindow.xaml                     | 11 ++++++-----
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/Control/Windows/ToDoInfoWindow.xaml b/Control/Windows/ToDoInfoWindow.xaml
index ab1bca3..7e212b5 100644
--- a/Control/Windows/ToDoInfoWindow.xaml
+++ b/Control/Windows/ToDoInfoWindow.xaml
@@ -30,6 +30,7 @@
             <Border.Resources>
                 <Style x:Key="LeftTB" TargetType="TextBlock" BasedOn="{StaticResource TextBlockBaseStyle}">
                     <Setter Property="Width" Value="67"/>
+                    <Setter Property="Margin" Value="0,5,0,0"/>
                     <Setter Property="HorizontalAlignment" Value="Left"/>
                     <Setter Property="VerticalAlignment" Value="Center"/>
                     <Setter Property="TextAlignment" Value="Center"/>
@@ -67,13 +68,15 @@
                          IsChecked="{Binding ExecType, Mode=OneWay, Converter={StaticResource TodoTaskExecConvert}, ConverterParameter=2}"/>
                     </hc:UniformSpacingPanel>
 
-                    <hc:UniformSpacingPanel x:Name="SetTimePanel" Visibility="Visible" Spacing="10" Grid.ColumnSpan="4" Margin="0,10,0,0">
-                        <TextBlock Text="指定时间:"  Style="{StaticResource LeftTB}"/>
-                        <TextBlock Text="*" Foreground="Red" Margin="-10,0,0,0"/>
-                        <hc:DateTimePicker x:Name="ExeTime" Text="{Binding ExeTime, Mode=OneWay}" ErrorStr="Error!"  Width="200" Margin="-5.2,0,0,0"/>
+                    <hc:UniformSpacingPanel x:Name="SetTimePanel" Height="30" Visibility="Visible" Spacing="10" Grid.ColumnSpan="4" Margin="0,10,0,0">
+                        <WrapPanel VerticalAlignment="Center">
+                            <TextBlock Text="指定时间:"  Style="{StaticResource LeftTB}"/>
+                            <TextBlock Text="*" Foreground="Red"/>
+                        </WrapPanel>
+                        <hc:DateTimePicker x:Name="ExeTime" Text="{Binding ExeTime, Mode=OneWay}" ErrorStr="Error!"  Width="200" Margin="1.6,0,0,0"/>
                     </hc:UniformSpacingPanel>
 
-                    <hc:UniformSpacingPanel x:Name="CronPanel" Visibility="Collapsed" Spacing="10" Grid.ColumnSpan="4" Margin="0,10,0,0">
+                    <hc:UniformSpacingPanel x:Name="CronPanel" Height="30" Visibility="Collapsed" Spacing="10" Grid.ColumnSpan="4" Margin="0,10,0,0">
                         <WrapPanel VerticalAlignment="Center">
                             <TextBlock Text="CRON:"  Style="{StaticResource LeftTB}"/>
                             <TextBlock Text="*" Foreground="Red" />
@@ -84,7 +87,9 @@
 
 
                     <hc:UniformSpacingPanel Spacing="10" Grid.ColumnSpan="4" Margin="0,10,0,0">
-                        <TextBlock Text="完成时间:"  Style="{StaticResource LeftTB}"/>
+                        <WrapPanel VerticalAlignment="Center">
+                            <TextBlock Text="完成时间:"  Style="{StaticResource LeftTB}"/>
+                        </WrapPanel>
                         <TextBlock x:Name="DoneTime" Text="{Binding DoneTime, Mode=OneWay}" Width="200"/>
                     </hc:UniformSpacingPanel>
 
diff --git a/MainWindow.xaml b/MainWindow.xaml
index 75688b5..475bee7 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -11,7 +11,8 @@
         x:Name="window"
         xmlns:hc="https://handyorg.github.io/handycontrol" xmlns:viewmodel="clr-namespace:GeekDesk.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:AppData}"
         Title="GeekDesk" 
-        d:DesignHeight="500" d:DesignWidth="700"
+        MinWidth="600"
+        MinHeight="400"
         WindowStyle="None"
         AllowsTransparency="True"
         Background="Transparent"
@@ -26,7 +27,7 @@
         <WindowChrome CaptionHeight="0" ResizeBorderThickness="15"/>
     </WindowChrome.WindowChrome>
     <Window.Resources>
-       
+
         <cvt:MenuWidthConvert x:Key="MenuWidthConvert"/>
         <cvt:OpcityConvert x:Key="OpcityConvert"/>
         <cvt:IntToCornerRadius x:Key="IntToCornerRadius"/>
@@ -37,7 +38,7 @@
         <DropShadowEffect BlurRadius="30" Direction="-90" Color="Gray"
                               RenderingBias="Quality" ShadowDepth="2"/>
     </Window.Effect>
-        <Border Margin="20" CornerRadius="{Binding AppConfig.PannelCornerRadius, Mode=TwoWay, Converter={StaticResource IntToCornerRadius}}"  BorderThickness="0"
+    <Border Margin="20" CornerRadius="{Binding AppConfig.PannelCornerRadius, Mode=TwoWay, Converter={StaticResource IntToCornerRadius}}"  BorderThickness="0"
             Background="AliceBlue" LostFocus="App_LostFocus"
             Opacity="{Binding AppConfig.PannelOpacity, Mode=TwoWay, Converter={StaticResource OpcityConvert}}"
             VirtualizingPanel.VirtualizationMode="Recycling"  VirtualizingPanel.IsVirtualizing="True"  VirtualizingPanel.IsContainerVirtualizable="True"
@@ -118,7 +119,7 @@
 
 
                     <uc:LeftCardControl Grid.Row="1" Grid.Column="0"/>
-                    
+
                     <!--分割线-->
                     <GridSplitter Opacity="0" Grid.Row="1" Grid.Column="0" Width="1"  VerticalAlignment="Stretch" HorizontalAlignment="Right"/>
 
@@ -129,7 +130,7 @@
                         <hc:NotifyIcon.ContextMenu>
                             <ContextMenu Width="130">
                                 <MenuItem Header="打开面板" Click="ShowApp"/>
-                                <MenuItem Header="关闭图标" Click="CloseBarIcon"/>
+                                <MenuItem Header="隐藏图标" Click="CloseBarIcon"/>
                                 <MenuItem Header="待办"  Click="BacklogMenuClick"/>
                                 <MenuItem Header="程序目录"  Click="OpenThisDir"/>
                                 <MenuItem Header="设置"  Click="ConfigApp"/>