Skip to content

Commit 94e6d9a

Browse files
committed
Apply @hypercubes review suggestions
1 parent 92f67fa commit 94e6d9a

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

editor/src/document/document_file.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -333,9 +333,12 @@ impl MessageHandler<DocumentMessage, &InputPreprocessor> for DocumentMessageHand
333333
let id = generate_uuid();
334334
responses.push_back(DocumentsMessage::CopySelectedLayers.into());
335335
responses.push_back(DocumentMessage::DeleteSelectedLayers.into());
336+
// TODO: add special case handling to create a sub folder if all selected layers
337+
// come from the same folder
336338
responses.push_back(DocumentOperation::CreateFolder { path: vec![id] }.into());
337339
self.layerdata_mut(&[id]).expanded = true;
338340
responses.push_back(DocumentsMessage::PasteLayers { path: vec![id], insert_index: -1 }.into());
341+
responses.push_back(DocumentMessage::SetSelectedLayers(vec![vec![id]]).into());
339342
}
340343
SetBlendModeForSelectedLayers(blend_mode) => {
341344
for path in self.layer_data.iter().filter_map(|(path, data)| data.selected.then(|| path.clone())) {
@@ -355,9 +358,10 @@ impl MessageHandler<DocumentMessage, &InputPreprocessor> for DocumentMessageHand
355358
ToggleLayerExpansion(path) => {
356359
self.layer_data(&path).expanded ^= true;
357360
match self.layer_data(&path).expanded {
358-
true => responses.extend(self.handle_folder_changed(path)),
359-
false => responses.push_back(FrontendMessage::CollapseFolder { path: path.into() }.into()),
361+
true => responses.extend(self.handle_folder_changed(path.clone())),
362+
false => responses.push_back(FrontendMessage::CollapseFolder { path: path.clone().into() }.into()),
360363
}
364+
responses.extend(self.layer_panel_entry(path.clone()).ok().map(|data| FrontendMessage::UpdateLayer { path: path.into(), data }.into()));
361365
}
362366
SelectionChanged => responses.push_back(SelectMessage::UpdateSelectionBoundingBox.into()),
363367
DeleteSelectedLayers => {

editor/src/input/input_mapper.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -192,12 +192,6 @@ impl Default for Mapping {
192192
entry! {action=DocumentMessage::DeselectAllLayers, key_down=KeyA, modifiers=[KeyControl, KeyAlt]},
193193
entry! {action=DocumentMessage::SelectAllLayers, key_down=KeyA, modifiers=[KeyControl]},
194194
entry! {action=DocumentMessage::CreateFolder(vec![]), key_down=KeyN, modifiers=[KeyControl, KeyShift]},
195-
entry! {action=DocumentMessage::DispatchOperation (Box::new(Operation::AddRect {
196-
path: vec![0],
197-
insert_index: -1,
198-
transform: DAffine2::default().to_cols_array(),
199-
style: style::PathStyle::default(),
200-
})), key_down=KeyG},
201195
entry! {action=DocumentMessage::DeleteSelectedLayers, key_down=KeyDelete},
202196
entry! {action=DocumentMessage::DeleteSelectedLayers, key_down=KeyX},
203197
entry! {action=DocumentMessage::DeleteSelectedLayers, key_down=KeyBackspace},

0 commit comments

Comments
 (0)