Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/draw.rs
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ impl<'a> Drawables<'a> {
self.state.processed_entries(),
self.state.skip_offset(),
self.state.selected_item(),
self.state.has_subitems(),
self.state.selected_has_subitems(),
self.tx.take().unwrap(),
&self.list_config,
),
Expand Down Expand Up @@ -84,7 +84,7 @@ pub fn make_drawables<'c: 'it, 's: 'it, 'it>(
let list_space = list_config.space_for_entries(
state.processed_entries().len().max(1),
scale,
state.has_subitems(),
state.selected_has_subitems(),
);
Some(Space {
width: 0.,
Expand Down
9 changes: 6 additions & 3 deletions src/state.rs
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ impl InputBuffer {
pub struct State {
input_buffer: InputBuffer,
skip_offset: usize,
// index without considering filtering
selected_item: usize,
selected_subitem: usize,
filtered_lines: FilteredLines,
Expand Down Expand Up @@ -146,9 +147,11 @@ impl State {
self.selected_item
}

pub fn has_subitems(&self) -> bool {
// For now either all items has subname or none.
self.inner.subentries_len(self.selected_item) > 0
pub fn selected_has_subitems(&self) -> bool {
self.filtered_lines
.index(self.selected_item)
.map(|idx| self.inner.subentries_len(idx))
.is_some_and(|count| count > 0)
}

pub fn processed_entries(&self) -> impl ExactSizeIterator<Item = ListItem<'_>> {
Expand Down
Loading