Skip to content
This repository was archived by the owner on Oct 16, 2020. It is now read-only.

Commit bbf0565

Browse files
committed
Deleting all selected bookmarks or breakpoints in pad (on Del key or toolbar command), not only one of them.
1 parent 16125c6 commit bbf0565

2 files changed

Lines changed: 15 additions & 5 deletions

File tree

src/Main/Base/Project/Editor/Bookmarks/BookmarkPad.cs

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,10 @@ public SDBookmark SelectedItem {
6565
get { return (SDBookmark)this.control.listView.SelectedItem; }
6666
}
6767

68+
public IEnumerable<SDBookmark> SelectedItems {
69+
get { return this.control.listView.SelectedItems.OfType<SDBookmark>(); }
70+
}
71+
6872
protected BookmarkPadBase()
6973
{
7074
this.control = new BookmarkPadContent();
@@ -86,11 +90,14 @@ protected BookmarkPadBase()
8690
};
8791

8892
this.control.listView.KeyDown += delegate(object sender, System.Windows.Input.KeyEventArgs e) {
89-
SDBookmark bm = this.control.listView.SelectedItem as SDBookmark;
90-
if (bm == null) return;
93+
var selectedItems = this.SelectedItems.ToList();
94+
if (!selectedItems.Any())
95+
return;
9196
switch (e.Key) {
9297
case System.Windows.Input.Key.Delete:
93-
SD.BookmarkManager.RemoveMark(bm);
98+
foreach (var selectedItem in selectedItems) {
99+
SD.BookmarkManager.RemoveMark(selectedItem);
100+
}
94101
break;
95102
}
96103
};

src/Main/Base/Project/Editor/Bookmarks/BookmarkPadToolbarCommands.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,11 @@ public class DeleteMark : AbstractMenuCommand
6767
public override void Run()
6868
{
6969
BookmarkPadBase pad = (BookmarkPadBase)this.Owner;
70-
if (pad.SelectedItem != null) {
71-
SD.BookmarkManager.RemoveMark(pad.SelectedItem);
70+
var selectedItems = pad.SelectedItems.ToList();
71+
if (selectedItems.Any()) {
72+
foreach (var selectedItem in selectedItems) {
73+
SD.BookmarkManager.RemoveMark(selectedItem);
74+
}
7275
}
7376
}
7477
}

0 commit comments

Comments
 (0)