diff options
| author | Sebastian Thiel <sthiel@thoughtworks.com> | 2019-06-15 13:58:05 +0800 |
|---|---|---|
| committer | Sebastian Thiel <sthiel@thoughtworks.com> | 2019-06-15 13:58:05 +0800 |
| commit | f8485c8d48fb231b113a6511ee4048712ccc27fc (patch) | |
| tree | c619b6421be1cebca1819ac55c7a3283176772be /src/interactive/widgets/mark.rs | |
| parent | 1ce57a29c45ee9896bfc529a13875dbc3859812f (diff) | |
First half-baked version of deletion within traversal tree
No size handling for now
Diffstat (limited to 'src/interactive/widgets/mark.rs')
| -rw-r--r-- | src/interactive/widgets/mark.rs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/interactive/widgets/mark.rs b/src/interactive/widgets/mark.rs index 688a48a..611dec0 100644 --- a/src/interactive/widgets/mark.rs +++ b/src/interactive/widgets/mark.rs @@ -92,7 +92,7 @@ impl MarkPane { pub fn key(mut self, key: Key) -> Option<(Self, Option<MarkMode>)> { let action = None; match key { - Ctrl('R') => return self.prepare_deletion(), + Ctrl('r') => return self.prepare_deletion(), Char('d') | Char(' ') => return self.remove_selected().map(|s| (s, action)), Ctrl('u') | PageUp => self.change_selection(CursorDirection::PageUp), Char('k') | Up => self.change_selection(CursorDirection::Up), @@ -134,7 +134,11 @@ impl MarkPane { d.num_errors_during_deletion = num_errors; } } - fn prepare_deletion(self) -> Option<(Self, Option<MarkMode>)> { + fn prepare_deletion(mut self) -> Option<(Self, Option<MarkMode>)> { + for entry in self.marked.values_mut() { + entry.num_errors_during_deletion = 0; + } + self.selected = Some(0); Some((self, Some(MarkMode::Delete))) } fn remove_selected(mut self) -> Option<Self> { @@ -314,7 +318,7 @@ impl MarkPane { Paragraph::new( [ Text::Styled( - " Ctrl + Shift + r".into(), + " Ctrl + r".into(), Style { fg: Color::LightRed, modifier: default_style.modifier | Modifier::RAPID_BLINK, |