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

Removed todo & readability tweak

Browse Source
This commit is contained in:
otdavies
2022-01-02 18:50:08 -08:00
parent 2396c7c5cc
commit 173d70ac47
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
editor/src/document/document_file.rs
+4 -5
View File
@@ -274,10 +274,7 @@ impl DocumentMessageHandler {
} }
pub fn selected_layers_without_children(&self) -> Vec<Vec<LayerId>> { pub fn selected_layers_without_children(&self) -> Vec<Vec<LayerId>> {
let mut without_children: Vec<Vec<LayerId>> = vec![]; // Traversing the layer tree recursively was chosen for both readability and instead of an n^2 comparison approach.
recurse_layer_tree(self, vec![], &mut without_children, false);
// Traversing the layer tree was chosen for both readability and instead of an n^2 comparison approach.
// A future optmiziation would be not needing to start at the root [] // A future optmiziation would be not needing to start at the root []
fn recurse_layer_tree(ctx: &DocumentMessageHandler, mut path: Vec<u64>, without_children: &mut Vec<Vec<LayerId>>, selected: bool) { 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 let Ok(folder) = ctx.graphene_document.folder(&path) {
@@ -297,6 +294,9 @@ impl DocumentMessageHandler {
} }
} }
} }
let mut without_children: Vec<Vec<LayerId>> = vec![];
recurse_layer_tree(self, vec![], &mut without_children, false);
without_children without_children
} }
@@ -593,7 +593,6 @@ impl MessageHandler<DocumentMessage, &InputPreprocessor> for DocumentMessageHand
responses.push_back(DocumentMessage::SetLayerExpansion(path, true).into()); responses.push_back(DocumentMessage::SetLayerExpansion(path, true).into());
} }
GroupSelectedLayers => { GroupSelectedLayers => {
// TODO simplify and protect unwrap
let mut new_folder_path: Vec<u64> = self.graphene_document.shallowest_common_folder(self.selected_layers()).unwrap_or(&[]).to_vec(); let mut new_folder_path: Vec<u64> = self.graphene_document.shallowest_common_folder(self.selected_layers()).unwrap_or(&[]).to_vec();
// Required for grouping parent folders with their own children // Required for grouping parent folders with their own children