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

Fix document becoming unsaved (*) when clicking with Select tool (#1509) 

Fix star on select tool
This commit is contained in:
0HyperCube 2023-12-11 22:14:20 +00:00 committed by GitHub
parent 421e7c025f
commit 6bce72dccd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
editor/src/messages/tool/tool_messages/select_tool.rs
View File

@ -532,7 +532,6 @@ impl Fsm for SelectToolFsmState {
SelectToolFsmState::Dragging SelectToolFsmState::Dragging
} else { } else {
responses.add(DocumentMessage::StartTransaction);
tool_data.layers_dragging = selected; tool_data.layers_dragging = selected;
if !input.keyboard.key(add_to_selection) && tool_data.nested_selection_behavior == NestedSelectionBehavior::Deepest { if !input.keyboard.key(add_to_selection) && tool_data.nested_selection_behavior == NestedSelectionBehavior::Deepest {
@ -541,6 +540,8 @@ impl Fsm for SelectToolFsmState {
} }
if let Some(intersection) = intersection { if let Some(intersection) = intersection {
responses.add(DocumentMessage::StartTransaction);
tool_data.layer_selected_on_start = Some(intersection); tool_data.layer_selected_on_start = Some(intersection);
selected = vec![intersection]; selected = vec![intersection];
@ -780,11 +781,16 @@ impl Fsm for SelectToolFsmState {
} }
(SelectToolFsmState::DrawingBox, SelectToolMessage::DragStop { .. } | SelectToolMessage::Enter) => { (SelectToolFsmState::DrawingBox, SelectToolMessage::DragStop { .. } | SelectToolMessage::Enter) => {
let quad = tool_data.selection_quad(); let quad = tool_data.selection_quad();
// For shallow select we don't update dragging layers until inside drag_start_shallowest_manipulation() let new_selected: HashSet<_> = document.document_legacy.intersect_quad(quad, &document.document_legacy.document_network).collect();
tool_data.layers_dragging = document.document_legacy.intersect_quad(quad, &document.document_legacy.document_network).collect(); let current_selected: HashSet<_> = document.metadata().selected_layers().collect();
responses.add_front(NodeGraphMessage::SelectedNodesSet { if new_selected != current_selected {
nodes: tool_data.layers_dragging.iter().map(|layer| layer.to_node()).collect(), tool_data.layers_dragging = new_selected.into_iter().collect();
}); responses.add(DocumentMessage::StartTransaction);
responses.add(NodeGraphMessage::SelectedNodesSet {
nodes: tool_data.layers_dragging.iter().map(|layer| layer.to_node()).collect(),
});
}
responses.add_front(DocumentMessage::Overlays( responses.add_front(DocumentMessage::Overlays(
Operation::DeleteLayer { Operation::DeleteLayer {
path: tool_data.drag_box_overlay_layer.take().unwrap(), path: tool_data.drag_box_overlay_layer.take().unwrap(),