jess
/
Graphite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Exclude hidden layers from Ctrl+A selection; prevent G/R/S/nudging hidden layers (#1697) 

* Exclude hidden layer to be selected on Select All Layer

* Add hide layer action to history

* Fix error call the function

* Add hide layer action to history state

* Make hidden layer cannot be transform like G/R/S and nudges

---------

Co-authored-by: Keavon Chambers <keavon@keavon.com>
This commit is contained in:
Haikal 2024-03-31 14:48:17 +07:00 committed by GitHub
parent e22db31738
commit 5bab38e173
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
editor/src/messages/portfolio/document/document_message_handler.rs
View File

@ -460,7 +460,11 @@ impl MessageHandler<DocumentMessage, DocumentMessageData<'_>> for DocumentMessag
match ipp.keyboard.key(resize) {
// Nudge translation
false => {
for layer in self.selected_nodes.selected_layers(self.metadata()) {
for layer in self
.selected_nodes
.selected_layers(self.metadata())
.filter(|&layer| self.selected_nodes.layer_visible(layer, self.metadata()))
{
responses.add(GraphOperationMessage::TransformChange {
layer,
transform: DAffine2::from_translation(delta),
@ -491,7 +495,11 @@ impl MessageHandler<DocumentMessage, DocumentMessageData<'_>> for DocumentMessag
let pivot = DAffine2::from_translation(pivot);
let transformation = pivot * scale * pivot.inverse();
for layer in self.selected_nodes.selected_layers(self.metadata()) {
for layer in self
.selected_nodes
.selected_layers(self.metadata())
.filter(|&layer| self.selected_nodes.layer_visible(layer, self.metadata()))
{
let to = self.metadata().document_to_viewport.inverse() * self.metadata().downstream_transform_to_viewport(layer);
let original_transform = self.metadata().upstream_transform(layer.to_node());
let new = to.inverse() * transformation * to * original_transform;
@ -614,8 +622,11 @@ impl MessageHandler<DocumentMessage, DocumentMessageData<'_>> for DocumentMessag
}
DocumentMessage::SelectAllLayers => {
let metadata = self.metadata();
let all_layers_except_artboards = metadata.all_layers().filter(move |&layer| !metadata.is_artboard(layer));
let nodes = all_layers_except_artboards.map(|layer| layer.to_node()).collect();
let all_layers_except_artboards_and_invisible = metadata
.all_layers()
.filter(move |&layer| !metadata.is_artboard(layer))
.filter(|&layer| self.selected_nodes.layer_visible(layer, metadata));
let nodes = all_layers_except_artboards_and_invisible.map(|layer| layer.to_node()).collect();
responses.add(NodeGraphMessage::SelectedNodesSet { nodes });
}
DocumentMessage::SelectedLayersLower => {

1
editor/src/messages/portfolio/document/node_graph/node_graph_message_handler.rs
View File

@ -459,6 +459,7 @@ impl<'a> MessageHandler<NodeGraphMessage, NodeGraphHandlerData<'a>> for NodeGrap
}
}
NodeGraphMessage::ToggleVisibility { node_id } => {
responses.add(DocumentMessage::StartTransaction);
let visible = document_metadata.node_is_visible(node_id);
let visible = !visible;

6
editor/src/messages/tool/transform_layer/transform_layer_message_handler.rs
View File

@ -45,7 +45,11 @@ impl<'a> MessageHandler<TransformLayerMessage, TransformData<'a>> for TransformL
fn process_message(&mut self, message: TransformLayerMessage, responses: &mut VecDeque<Message>, (document, input, tool_data, shape_editor): TransformData) {
let using_path_tool = tool_data.active_tool_type == ToolType::Path;
let selected_layers = document.selected_nodes.selected_layers(document.metadata()).collect::<Vec<_>>();
let selected_layers = document
.selected_nodes
.selected_layers(document.metadata())
.filter(|&layer| document.metadata().node_is_visible(layer.to_node()))
.collect::<Vec<_>>();
let mut selected = Selected::new(
&mut self.original_transforms,