Browse Source

修改样式和待办中保存无法删除原有任务的bug

liufei 3 years ago
parent
commit
a03fb713e4
2 changed files with 10 additions and 3 deletions
  1. 1 1
      Control/Windows/ToDoInfoWindow.xaml
  2. 9 2
      Control/Windows/ToDoInfoWindow.xaml.cs

+ 1 - 1
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>
 
 

+ 9 - 2
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;