From 2f22ce500c63661b1d1374684624918e9bb115ba Mon Sep 17 00:00:00 2001 From: 0SlowPoke0 <142654792+0SlowPoke0@users.noreply.github.com> Date: Sun, 6 Apr 2025 15:14:10 +0530 Subject: [PATCH] Fix a bug in #2419 (Add recursive folder expand/collapse to the Layers panel) (#2494) recursive-collapse-fix and clippy-fix Co-authored-by: Keavon Chambers --- .../messages/portfolio/document/document_message_handler.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/editor/src/messages/portfolio/document/document_message_handler.rs b/editor/src/messages/portfolio/document/document_message_handler.rs index 07bef6e7..cc33f987 100644 --- a/editor/src/messages/portfolio/document/document_message_handler.rs +++ b/editor/src/messages/portfolio/document/document_message_handler.rs @@ -1209,14 +1209,14 @@ impl MessageHandler> for DocumentMessag if is_collapsed { if recursive { - let children: HashSet<_> = layer.children(metadata).collect(); + let children: HashSet<_> = layer.descendants(metadata).collect(); self.collapsed.0.retain(|collapsed_layer| !children.contains(collapsed_layer) && collapsed_layer != &layer); } else { self.collapsed.0.retain(|collapsed_layer| collapsed_layer != &layer); } } else { if recursive { - let children_to_add: Vec<_> = layer.children(metadata).filter(|child| !self.collapsed.0.contains(child)).collect(); + let children_to_add: Vec<_> = layer.descendants(metadata).filter(|child| !self.collapsed.0.contains(child)).collect(); self.collapsed.0.extend(children_to_add); } self.collapsed.0.push(layer);