fork/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2026-09-26 05:18:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Replace recursive tree traversal with prefix matching

Browse Source
This commit is contained in:
Dennis
2022-01-04 00:32:55 +01:00
parent bf41b3e195
commit 6bcbb9f82f
1 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
editor/src/document/document_file.rs
+14 -21
View File
@@ -274,30 +274,23 @@ impl DocumentMessageHandler {
} }
pub fn selected_layers_without_children(&self) -> Vec<Vec<LayerId>> { pub fn selected_layers_without_children(&self) -> Vec<Vec<LayerId>> {
// Traversing the layer tree recursively was chosen for both readability and instead of an n^2 comparison approach. let mut sorted_layers = self.selected_layers().collect::<Vec<_>>();
// A future optmiziation would be not needing to start at the root [] sorted_layers.sort();
fn recurse_layer_tree(ctx: &DocumentMessageHandler, mut path: Vec<u64>, without_children: &mut Vec<Vec<LayerId>>, selected: bool) {
if let Ok(folder) = ctx.graphene_document.folder(&path) { if sorted_layers.is_empty() {
for child in folder.list_layers() { return vec![];
path.push(*child); }
let selected_or_parent_selected = selected || ctx.selected_layers_contains(&path);
let selected_without_any_parent_selected = !selected && ctx.selected_layers_contains(&path); let mut current_path = sorted_layers.first().unwrap();
if ctx.graphene_document.is_folder(&path) { let mut keep = vec![current_path.to_vec()];
if selected_without_any_parent_selected { for path in &sorted_layers {
without_children.push(path.clone()); if !path.starts_with(current_path) {
} keep.push(path.to_vec());
recurse_layer_tree(ctx, path.clone(), without_children, selected_or_parent_selected); current_path = path;
} else if selected_without_any_parent_selected {
without_children.push(path.clone());
}
path.pop();
}
} }
} }
let mut without_children: Vec<Vec<LayerId>> = vec![]; keep
recurse_layer_tree(self, vec![], &mut without_children, false);
without_children
} }
pub fn selected_layers_contains(&self, path: &[LayerId]) -> bool { pub fn selected_layers_contains(&self, path: &[LayerId]) -> bool {