Skip to content

Commit

Permalink
Now it's way more intuitive, and you can basically do everything…
Browse files Browse the repository at this point in the history
…even though it can still panic (and I don't see why due to the
alternate screen), I think one should not delete things from disk
while they are being added.
  • Loading branch information
Byron committed Mar 29, 2020
1 parent d7d9a8b commit 164d885
Showing 1 changed file with 12 additions and 8 deletions.
20 changes: 12 additions & 8 deletions src/interactive/app/eventloop.rs
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,8 @@ impl TerminalApp {
{
terminal.hide_cursor()?;
terminal.clear()?;
let mut display_options: DisplayOptions = options.clone().into();
display_options.byte_vis = ByteVisualization::Bar;
let mut display: DisplayOptions = options.clone().into();
display.byte_vis = ByteVisualization::Bar;
let mut window = MainWindow::default();
let (keys_tx, keys_rx) = crossbeam_channel::unbounded();
match mode {
Expand Down Expand Up @@ -219,14 +219,14 @@ impl TerminalApp {
s.process_events(
&mut window,
traversal,
&mut display_options,
&mut display,
terminal,
fetch_buffered_key_events().into_iter(),
)?;
Ok(())
})?;

display_options.byte_vis = ByteVisualization::PercentageAndBar;
display.byte_vis = ByteVisualization::PercentageAndBar;
Ok(TerminalApp {
state: {
let mut s = state.unwrap_or_else(|| {
Expand All @@ -241,13 +241,17 @@ impl TerminalApp {
}
});
s.reset_message();
s.entries = sorted_entries(&traversal.tree, traversal.root_index, s.sorting);
s.selected = s.entries.get(0).map(|b| b.index);
s.entries = sorted_entries(
&traversal.tree,
s.root,
s.sorting,
);
s.selected = s.selected.or_else(|| s.entries.get(0).map(|b| b.index));
s
},
display: display_options,
display,
traversal,
window: Default::default(),
window,
})
}
}
Expand Down

0 comments on commit 164d885

Please sign in to comment.