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

Make locked layer cannot be moved and disable bounding box

Browse Source
This commit is contained in:
haikalvidya
2024-03-29 17:31:00 +07:00
parent b854a5a1d3
commit f193beb5da
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
editor/src/messages/portfolio/document/utility_types/nodes.rs
+3 -2
View File
@@ -69,8 +69,9 @@ impl SelectedNodes {
layer.ancestors(metadata).any(|layer| metadata.node_is_locked(layer.to_node())) layer.ancestors(metadata).any(|layer| metadata.node_is_locked(layer.to_node()))
} }
pub fn selected_locked_layers<'a>(&'a self, metadata: &'a DocumentMetadata) -> impl Iterator<Item = LayerNodeIdentifier> + '_ { pub fn selected_visible_and_unlocked_layers<'a>(&'a self, metadata: &'a DocumentMetadata) -> impl Iterator<Item = LayerNodeIdentifier> + '_ {
self.selected_layers(metadata).filter(move |&layer| self.layer_locked(layer, metadata)) self.selected_layers(metadata)
.filter(move |&layer| self.layer_visible(layer, metadata) && !self.layer_locked(layer, metadata))
} }
pub fn selected_layers<'a>(&'a self, metadata: &'a DocumentMetadata) -> impl Iterator<Item = LayerNodeIdentifier> + '_ { pub fn selected_layers<'a>(&'a self, metadata: &'a DocumentMetadata) -> impl Iterator<Item = LayerNodeIdentifier> + '_ {
editor/src/messages/tool/tool_messages/select_tool.rs
+3 -3
View File
@@ -391,7 +391,7 @@ impl Fsm for SelectToolFsmState {
tool_data.selected_layers_count = selected_layers_count; tool_data.selected_layers_count = selected_layers_count;
// Outline selected layers // Outline selected layers
for layer in document.selected_nodes.selected_visible_layers(document.metadata()) { for layer in document.selected_nodes.selected_visible_and_unlocked_layers(document.metadata()) {
overlay_context.outline(document.metadata().layer_outline(layer), document.metadata().transform_to_viewport(layer)); overlay_context.outline(document.metadata().layer_outline(layer), document.metadata().transform_to_viewport(layer));
} }
@@ -405,13 +405,13 @@ impl Fsm for SelectToolFsmState {
// Update bounds // Update bounds
let transform = document let transform = document
.selected_nodes .selected_nodes
.selected_visible_layers(document.metadata()) .selected_visible_and_unlocked_layers(document.metadata())
.next() .next()
.map(|layer| document.metadata().transform_to_viewport(layer)); .map(|layer| document.metadata().transform_to_viewport(layer));
let transform = transform.unwrap_or(DAffine2::IDENTITY); let transform = transform.unwrap_or(DAffine2::IDENTITY);
let bounds = document let bounds = document
.selected_nodes .selected_nodes
.selected_visible_layers(document.metadata()) .selected_visible_and_unlocked_layers(document.metadata())
.filter_map(|layer| { .filter_map(|layer| {
document document
.metadata() .metadata()