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

Don't save undo/redo history when aborting transactions (#1660) 

* Create a forgetable undo/redo function used by AbortTransaction

* Rework and fix new undo/redo functions

* Add space before comments

---------

Co-authored-by: Keavon Chambers <keavon@keavon.com>
This commit is contained in:
milan-sedivy 2024-03-11 03:39:33 +02:00 committed by GitHub
parent 822b25ceb6
commit d714166c69
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -386,8 +386,8 @@ impl MessageHandler<DocumentMessage, DocumentInputs<'_>> for DocumentMessageHand
responses.add(NodeGraphMessage::SelectedNodesSet { nodes: vec![] });
self.layer_range_selection_reference = None;
}
DocumentHistoryBackward => self.undo(responses),
DocumentHistoryForward => self.redo(responses),
DocumentHistoryBackward => self.undo_with_history(responses),
DocumentHistoryForward => self.redo_with_history(responses),
DocumentStructureChanged => {
self.update_layers_panel_options_bar_widgets(responses);
@ -1073,30 +1073,40 @@ impl DocumentMessageHandler {
std::mem::replace(&mut self.network, network)
}
pub fn undo(&mut self, responses: &mut VecDeque<Message>) {
// Push the UpdateOpenDocumentsList message to the bus in order to update the save status of the open documents
responses.add(PortfolioMessage::UpdateOpenDocumentsList);
pub fn undo_with_history(&mut self, responses: &mut VecDeque<Message>) {
let Some(previous_network) = self.undo(responses) else { return };
let Some(network) = self.document_undo_history.pop_back() else { return };
responses.add(BroadcastEvent::SelectionChanged);
let previous_network = std::mem::replace(&mut self.network, network);
self.document_redo_history.push_back(previous_network);
if self.document_redo_history.len() > crate::consts::MAX_UNDO_HISTORY_LEN {
self.document_redo_history.pop_front();
}
}
pub fn redo(&mut self, responses: &mut VecDeque<Message>) {
pub fn undo(&mut self, responses: &mut VecDeque<Message>) -> Option<NodeNetwork> {
// Push the UpdateOpenDocumentsList message to the bus in order to update the save status of the open documents
responses.add(PortfolioMessage::UpdateOpenDocumentsList);
let Some(network) = self.document_redo_history.pop_back() else { return };
// If there is no history return and don't broadcast SelectionChanged
let Some(network) = self.document_undo_history.pop_back() else { return None };
responses.add(BroadcastEvent::SelectionChanged);
let previous_network = std::mem::replace(&mut self.network, network);
Some(previous_network)
}
pub fn redo(&mut self, responses: &mut VecDeque<Message>) -> Option<NodeNetwork> {
// Push the UpdateOpenDocumentsList message to the bus in order to update the save status of the open documents
responses.add(PortfolioMessage::UpdateOpenDocumentsList);
// If there is no history return and don't broadcast SelectionChanged
let Some(network) = self.document_redo_history.pop_back() else { return None };
responses.add(BroadcastEvent::SelectionChanged);
let previous_network = std::mem::replace(&mut self.network, network);
Some(previous_network)
}
pub fn redo_with_history(&mut self, responses: &mut VecDeque<Message>) {
// Push the UpdateOpenDocumentsList message to the bus in order to update the save status of the open documents
let Some(previous_network) = self.redo(responses) else { return };
self.document_undo_history.push_back(previous_network);
if self.document_undo_history.len() > crate::consts::MAX_UNDO_HISTORY_LEN {
self.document_undo_history.pop_front();