개정판 34ac8db7
Fix: Delete에 대한 Undo/Redo 기능 수정
Change-Id: I55592f4822b661ed7f61c714382bd8d988145ef7
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 2834 | 2834 |
|
| 2835 | 2835 |
if (text_item != null && (currentControl as ArrowTextControl) == null) |
| 2836 | 2836 |
{
|
| 2837 |
DeleteCommand.Instance.Execute(new[] { text_item });
|
|
| 2838 |
//ViewerDataModel.Instance.MarkupControls_USER.Remove(text_item); |
|
| 2837 |
UndoCommand.Instance.Push(EventType.Delete, new[] { text_item });
|
|
| 2839 | 2838 |
} |
| 2840 | 2839 |
|
| 2841 | 2840 |
/// up to here |
| ... | ... | |
| 3978 | 3977 |
var vPreviousControl = previousControl as TextControl; |
| 3979 | 3978 |
if (string.IsNullOrEmpty(vPreviousControl.Text)) |
| 3980 | 3979 |
{
|
| 3981 |
DeleteCommand.Instance.Execute(new[] { previousControl });
|
|
| 3980 |
UndoCommand.Instance.Push(EventType.Delete, new[] { previousControl });
|
|
| 3982 | 3981 |
previousControl = null; |
| 3983 | 3982 |
} |
| 3984 | 3983 |
else |
| ... | ... | |
| 4030 | 4029 |
var vPreviousControl = previousControl as TextControl; |
| 4031 | 4030 |
if (string.IsNullOrEmpty(vPreviousControl.Text)) |
| 4032 | 4031 |
{
|
| 4033 |
DeleteCommand.Instance.Execute(new[] { previousControl });
|
|
| 4032 |
UndoCommand.Instance.Push(EventType.Delete, new[] { previousControl });
|
|
| 4034 | 4033 |
previousControl = null; |
| 4035 | 4034 |
} |
| 4036 | 4035 |
else |
| ... | ... | |
| 4085 | 4084 |
var vPreviousControl = previousControl as TextControl; |
| 4086 | 4085 |
if (string.IsNullOrEmpty(vPreviousControl.Text)) |
| 4087 | 4086 |
{
|
| 4088 |
DeleteCommand.Instance.Execute(new[] { previousControl });
|
|
| 4087 |
UndoCommand.Instance.Push(EventType.Delete, new[] { previousControl });
|
|
| 4089 | 4088 |
previousControl = null; |
| 4090 | 4089 |
} |
| 4091 | 4090 |
else |
| ... | ... | |
| 4700 | 4699 |
|
| 4701 | 4700 |
if (string.IsNullOrEmpty(control.ArrowText)) |
| 4702 | 4701 |
{
|
| 4703 |
DeleteCommand.Instance.Execute(new [] { control });
|
|
| 4702 |
UndoCommand.Instance.Push(EventType.Delete, new [] { control });
|
|
| 4704 | 4703 |
} |
| 4705 | 4704 |
}; |
| 4706 | 4705 |
|
| ... | ... | |
| 4765 | 4764 |
var control = ViewerDataModel.Instance.MarkupControls_USER.Where(data => data.IsMouseEnter).FirstOrDefault(); |
| 4766 | 4765 |
if (control != null) |
| 4767 | 4766 |
{
|
| 4768 |
DeleteCommand.Instance.Execute(new List<CommentUserInfo>() { control });
|
|
| 4767 |
UndoCommand.Instance.Push(EventType.Delete, new List<CommentUserInfo>() { control });
|
|
| 4769 | 4768 |
} |
| 4770 | 4769 |
} |
| 4771 | 4770 |
|
내보내기 Unified diff
