diff --git a/Control/UserControls/ToDo/TodoControl.xaml.cs b/Control/UserControls/ToDo/TodoControl.xaml.cs index 25442d3..971ab83 100644 --- a/Control/UserControls/ToDo/TodoControl.xaml.cs +++ b/Control/UserControls/ToDo/TodoControl.xaml.cs @@ -19,12 +19,18 @@ using System.Windows.Shapes; namespace GeekDesk.Control.UserControls.Backlog { + + public enum ToDoType + { + HISTORY = 1, + NEW = 2 + } /// /// BacklogControl.xaml 的交互逻辑 /// public partial class TodoControl : UserControl { - private AppData appData = MainWindow.appData; + public ToDoType type; public TodoControl() { InitializeComponent(); @@ -37,7 +43,14 @@ namespace GeekDesk.Control.UserControls.Backlog { if (isConfirmed) { - appData.ToDoList.Remove(info); + if (type == ToDoType.NEW) + { + MainWindow.appData.ToDoList.Remove(info); + } + else + { + MainWindow.appData.HiToDoList.Remove(info); + } CommonCode.SaveAppData(MainWindow.appData); } return true; diff --git a/Control/Windows/ToDoWindow.xaml.cs b/Control/Windows/ToDoWindow.xaml.cs index c68072d..4f1ded7 100644 --- a/Control/Windows/ToDoWindow.xaml.cs +++ b/Control/Windows/ToDoWindow.xaml.cs @@ -64,9 +64,11 @@ namespace GeekDesk.Control.Windows { case "History": backlog.BacklogList.ItemsSource = appData.HiToDoList; + backlog.type = ToDoType.HISTORY; break; default: backlog.BacklogList.ItemsSource = appData.ToDoList; + backlog.type = ToDoType.NEW; break; } }