Garmelon/cove
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix message count in folded info

Browse source
This commit is contained in:
Joscha 2022-08-09 15:12:49 +02:00
parent 87a14eedf2
commit c41ab742d3
2 changed files with 21 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/ui/chat/tree/layout.rs
View file

@ -90,12 +90,13 @@ impl<M: Msg + ChatMsg, S: MsgStore<M>> InnerTreeViewState<M, S> {
blocks.blocks_mut().push_back(block);
}
// Last part of message body if message is folded
let folded = self.folded.contains(id);
let children = tree.children(id);
let folded_info = children
.filter(|_| folded)
.map(|c| c.len())
.filter(|c| *c > 0);
let folded_info = if folded {
Some(tree.subtree_size(id)).filter(|s| *s > 0)
} else {
None
};
// Main message body
let highlighted = self.cursor.refers_to(id);
@ -107,10 +108,12 @@ impl<M: Msg + ChatMsg, S: MsgStore<M>> InnerTreeViewState<M, S> {
let block = Block::new(frame, BlockId::Msg(id.clone()), widget);
blocks.blocks_mut().push_back(block);
// Children recursively (if not folded)
if let Some(children) = children.filter(|_| !folded) {
for child in children {
self.layout_subtree(nick, frame, tree, indent + 1, child, blocks);
// Children, recursively
if !folded {
if let Some(children) = tree.children(id) {
for child in children {
self.layout_subtree(nick, frame, tree, indent + 1, child, blocks);
}
}
}