From 1dd869116719a20f503e05f3b01cddb8b0c97ed6 Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Sat, 23 Jul 2016 11:30:20 +0200 Subject: Fix auto palette when using extensions (bzr r15019) --- src/document-undo.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/document-undo.cpp') diff --git a/src/document-undo.cpp b/src/document-undo.cpp index eb0ac7707..c27904ea8 100644 --- a/src/document-undo.cpp +++ b/src/document-undo.cpp @@ -196,6 +196,7 @@ void Inkscape::DocumentUndo::cancel(SPDocument *doc) if (doc->priv->partial) { sp_repr_undo_log (doc->priv->partial); + doc->emitReconstructionFinish(); sp_repr_free_log (doc->priv->partial); doc->priv->partial = NULL; } @@ -222,6 +223,8 @@ static void perform_document_update(SPDocument &doc) { doc.ensureUpToDate(); Inkscape::XML::Event *update_log=sp_repr_commit_undoable(doc.rdoc); + doc.emitReconstructionFinish(); + if (update_log != NULL) { g_warning("Document was modified while being updated after undo operation"); sp_repr_debug_print_log(update_log); @@ -322,8 +325,10 @@ gboolean Inkscape::DocumentUndo::redo(SPDocument *doc) doc->priv->sensitive = TRUE; doc->priv->seeking = false; - if (ret) + if (ret) { INKSCAPE.external_change(); + doc->emitReconstructionFinish(); + } return ret; } -- cgit v1.2.3 From f35bb1f74a0ffeb5c6477a25e3c4cde87a97bcf1 Mon Sep 17 00:00:00 2001 From: Adrian Boguszewski Date: Thu, 28 Jul 2016 12:06:06 +0200 Subject: Removed unused includes, decrease compilation time (bzr r15025) --- src/document-undo.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/document-undo.cpp') diff --git a/src/document-undo.cpp b/src/document-undo.cpp index c27904ea8..113d09d66 100644 --- a/src/document-undo.cpp +++ b/src/document-undo.cpp @@ -45,7 +45,6 @@ */ #include -#include #include "xml/repr.h" #include "document-private.h" #include "inkscape.h" -- cgit v1.2.3 From 43b49e325db73cc19b1731db6c69545664ee8fbe Mon Sep 17 00:00:00 2001 From: Adrian Boguszewski Date: Thu, 28 Jul 2016 13:26:17 +0200 Subject: Reverted changes to r15024 after many building problems (bzr r15027) --- src/document-undo.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/document-undo.cpp') diff --git a/src/document-undo.cpp b/src/document-undo.cpp index 113d09d66..c27904ea8 100644 --- a/src/document-undo.cpp +++ b/src/document-undo.cpp @@ -45,6 +45,7 @@ */ #include +#include #include "xml/repr.h" #include "document-private.h" #include "inkscape.h" -- cgit v1.2.3 From 35830f456cadaecf8b8e3944e3031a1a93f6cb41 Mon Sep 17 00:00:00 2001 From: Adrian Boguszewski Date: Wed, 3 Aug 2016 15:29:38 +0200 Subject: Removed unused includes, decreased compilation time. Once again (bzr r15034) --- src/document-undo.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/document-undo.cpp') diff --git a/src/document-undo.cpp b/src/document-undo.cpp index c27904ea8..113d09d66 100644 --- a/src/document-undo.cpp +++ b/src/document-undo.cpp @@ -45,7 +45,6 @@ */ #include -#include #include "xml/repr.h" #include "document-private.h" #include "inkscape.h" -- cgit v1.2.3