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

Fix Select tool's broken undo (#1597) 

Fix select tool undo
This commit is contained in:
zhiyuan 2024-02-06 06:40:27 +08:00 committed by Keavon Chambers
parent 7e5069f638
commit e1735ddf84
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -809,7 +809,7 @@ impl MessageHandler<DocumentMessage, DocumentInputs<'_>> for DocumentMessageHand
} }
Undo => { Undo => {
self.undo_in_progress = true; self.undo_in_progress = true;
responses.add(ToolMessage::PreUndo);
responses.add(DocumentMessage::DocumentHistoryBackward); responses.add(DocumentMessage::DocumentHistoryBackward);
responses.add(OverlaysMessage::Draw); responses.add(OverlaysMessage::Draw);
responses.add(DocumentMessage::UndoFinished); responses.add(DocumentMessage::UndoFinished);

1
editor/src/messages/tool/tool_message.rs
View File

@ -126,6 +126,7 @@ pub enum ToolMessage {
}, },
DeactivateTools, DeactivateTools,
InitTools, InitTools,
PreUndo,
Redo, Redo,
RefreshToolOptions, RefreshToolOptions,
ResetColors, ResetColors,

13
editor/src/messages/tool/tool_message_handler.rs
View File

@ -177,6 +177,15 @@ impl MessageHandler<ToolMessage, (&DocumentMessageHandler, DocumentId, &InputPre
tool_data.active_tool_mut().process_message(ToolMessage::UpdateHints, responses, &mut data); tool_data.active_tool_mut().process_message(ToolMessage::UpdateHints, responses, &mut data);
tool_data.active_tool_mut().process_message(ToolMessage::UpdateCursor, responses, &mut data); tool_data.active_tool_mut().process_message(ToolMessage::UpdateCursor, responses, &mut data);
} }
ToolMessage::PreUndo => {
let tool_data = &mut self.tool_state.tool_data;
match tool_data.active_tool_type {
ToolType::Pen => {}
_ => {
responses.add(BroadcastEvent::ToolAbort);
}
}
}
ToolMessage::Redo => { ToolMessage::Redo => {
let tool_data = &mut self.tool_state.tool_data; let tool_data = &mut self.tool_state.tool_data;
match tool_data.active_tool_type { match tool_data.active_tool_type {
@ -236,9 +245,7 @@ impl MessageHandler<ToolMessage, (&DocumentMessageHandler, DocumentId, &InputPre
ToolType::Pen => { ToolType::Pen => {
responses.add(PenToolMessage::Undo); responses.add(PenToolMessage::Undo);
} }
_ => { _ => {}
responses.add(BroadcastEvent::ToolAbort);
}
} }
} }