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

Rename tree_id to root_id

Browse source
This commit is contained in:
Joscha 2022-09-09 21:54:27 +02:00
parent da2c3d86f5
commit cb1fdb41b8
6 changed files with 69 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/ui/chat/tree/cursor.rs
View file

@ -101,9 +101,9 @@ impl<M: Msg, S: MsgStore<M>> InnerTreeViewState<M, S> {
} else if tree.parent(id).is_none() {
// We're at the root of our tree, so we need to move to the root of
// the previous tree.
if let Some(prev_tree_id) = store.prev_tree_id(tree.root()).await {
*tree = store.tree(&prev_tree_id).await;
*id = prev_tree_id;
if let Some(prev_root_id) = store.prev_root_id(tree.root()).await {
*tree = store.tree(&prev_root_id).await;
*id = prev_root_id;
true
} else {
false
@ -123,9 +123,9 @@ impl<M: Msg, S: MsgStore<M>> InnerTreeViewState<M, S> {
} else if tree.parent(id).is_none() {
// We're at the root of our tree, so we need to move to the root of
// the next tree.
if let Some(next_tree_id) = store.next_tree_id(tree.root()).await {
*tree = store.tree(&next_tree_id).await;
*id = next_tree_id;
if let Some(next_root_id) = store.next_root_id(tree.root()).await {
*tree = store.tree(&next_root_id).await;
*id = next_root_id;
true
} else {
false
@ -183,9 +183,9 @@ impl<M: Msg, S: MsgStore<M>> InnerTreeViewState<M, S> {
pub async fn move_cursor_up(&mut self) {
match &mut self.cursor {
Cursor::Bottom | Cursor::Pseudo { parent: None, .. } => {
if let Some(last_tree_id) = self.store.last_tree_id().await {
let tree = self.store.tree(&last_tree_id).await;
let mut id = last_tree_id;
if let Some(last_root_id) = self.store.last_root_id().await {
let tree = self.store.tree(&last_root_id).await;
let mut id = last_root_id;
while Self::find_last_child(&self.folded, &tree, &mut id) {}
self.cursor = Cursor::Msg(id);
}
@ -243,8 +243,8 @@ impl<M: Msg, S: MsgStore<M>> InnerTreeViewState<M, S> {
pub async fn move_cursor_up_sibling(&mut self) {
match &mut self.cursor {
Cursor::Bottom | Cursor::Pseudo { parent: None, .. } => {
if let Some(last_tree_id) = self.store.last_tree_id().await {
self.cursor = Cursor::Msg(last_tree_id);
if let Some(last_root_id) = self.store.last_root_id().await {
self.cursor = Cursor::Msg(last_root_id);
}
}
Cursor::Msg(msg) => {
@ -392,8 +392,8 @@ impl<M: Msg, S: MsgStore<M>> InnerTreeViewState<M, S> {
}
pub async fn move_cursor_to_top(&mut self) {
if let Some(first_tree_id) = self.store.first_tree_id().await {
self.cursor = Cursor::Msg(first_tree_id);
if let Some(first_root_id) = self.store.first_root_id().await {
self.cursor = Cursor::Msg(first_root_id);
self.correction = Some(Correction::MakeCursorVisible);
}
}

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

@ -181,15 +181,15 @@ impl<M: Msg + ChatMsg, S: MsgStore<M>> InnerTreeViewState<M, S> {
while blocks.blocks().top_line > top_line {
let top_root = blocks.top_root();
let prev_tree_id = match top_root {
Root::Bottom => self.store.last_tree_id().await,
Root::Tree(tree_id) => self.store.prev_tree_id(tree_id).await,
let prev_root_id = match top_root {
Root::Bottom => self.store.last_root_id().await,
Root::Tree(root_id) => self.store.prev_root_id(root_id).await,
};
let prev_tree_id = match prev_tree_id {
Some(tree_id) => tree_id,
let prev_root_id = match prev_root_id {
Some(id) => id,
None => break,
};
let prev_tree = self.store.tree(&prev_tree_id).await;
let prev_tree = self.store.tree(&prev_root_id).await;
blocks.prepend(self.layout_tree(nick, frame, prev_tree));
}
}
@ -204,12 +204,12 @@ impl<M: Msg + ChatMsg, S: MsgStore<M>> InnerTreeViewState<M, S> {
while blocks.blocks().bottom_line < bottom_line {
let bottom_root = blocks.bottom_root();
let next_tree_id = match bottom_root {
let next_root_id = match bottom_root {
Root::Bottom => break,
Root::Tree(tree_id) => self.store.next_tree_id(tree_id).await,
Root::Tree(root_id) => self.store.next_root_id(root_id).await,
};
if let Some(next_tree_id) = next_tree_id {
let next_tree = self.store.tree(&next_tree_id).await;
if let Some(next_root_id) = next_root_id {
let next_tree = self.store.tree(&next_root_id).await;
blocks.append(self.layout_tree(nick, frame, next_tree));
} else {
blocks.append(self.layout_bottom(nick, frame));