From a03fb713e472bf2efda0c75373cd74d39cc647a9 Mon Sep 17 00:00:00 2001
From: liufei <demoliu94@163.com>
Date: Mon, 10 Jan 2022 17:56:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F=E5=92=8C?=
 =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E4=BF=9D=E5=AD=98=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8E=9F=E6=9C=89=E4=BB=BB=E5=8A=A1=E7=9A=84?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Control/Windows/ToDoInfoWindow.xaml    |  2 +-
 Control/Windows/ToDoInfoWindow.xaml.cs | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Control/Windows/ToDoInfoWindow.xaml b/Control/Windows/ToDoInfoWindow.xaml
index 7e212b5..e288b38 100644
--- a/Control/Windows/ToDoInfoWindow.xaml
+++ b/Control/Windows/ToDoInfoWindow.xaml
@@ -90,7 +90,7 @@
                         <WrapPanel VerticalAlignment="Center">
                             <TextBlock Text="完成时间:"  Style="{StaticResource LeftTB}"/>
                         </WrapPanel>
-                        <TextBlock x:Name="DoneTime" Text="{Binding DoneTime, Mode=OneWay}" Width="200"/>
+                        <TextBlock x:Name="DoneTime" VerticalAlignment="Center" Margin="5,6,0,0" Text="{Binding DoneTime, Mode=OneWay}" Width="200"/>
                     </hc:UniformSpacingPanel>
 
 
diff --git a/Control/Windows/ToDoInfoWindow.xaml.cs b/Control/Windows/ToDoInfoWindow.xaml.cs
index cd95121..a5ed3be 100644
--- a/Control/Windows/ToDoInfoWindow.xaml.cs
+++ b/Control/Windows/ToDoInfoWindow.xaml.cs
@@ -151,8 +151,15 @@ namespace GeekDesk.Control.Windows
             };
             if (windowType != NEW_TODO)
             {
-                appData.HiToDoList.Remove(this.DataContext as ToDoInfo);
-            } 
+                ToDoInfo tdi = this.DataContext as ToDoInfo;
+                if (appData.HiToDoList.Contains(tdi))
+                {
+                    appData.HiToDoList.Remove(tdi);
+                } else if (appData.ToDoList.Contains(tdi))
+                {
+                    appData.ToDoList.Remove(tdi);
+                }
+            }
             appData.ToDoList.Add(info);
 
             DateTime dtNow = DateTime.Now;