summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiederik van Lierop <mail@diedenrezi.nl>2009-04-27 20:05:57 +0000
committerdvlierop2 <dvlierop2@users.sourceforge.net>2009-04-27 20:05:57 +0000
commitbba59e89a571cd79aaa70e6c56621235f624efb0 (patch)
treec52ee546b69305fd7c85deebac0f5ddfdbc22673
parentCleaning up legacy stock icons and correct icon sizes to match theme engine s... (diff)
downloadinkscape-bba59e89a571cd79aaa70e6c56621235f624efb0.tar.gz
inkscape-bba59e89a571cd79aaa70e6c56621235f624efb0.zip
Make the snap toolbar unsensitive to undo actions. How could I not have noticed this bug before?
(bzr r7780)
-rw-r--r--src/widgets/toolbox.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index fba4f58ce..fbcb397cf 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -1886,6 +1886,7 @@ void toggle_snap_callback (GtkToggleAction *act, gpointer data) { //data points
SPDesktop *dt = reinterpret_cast<SPDesktop*>(ptr);
SPNamedView *nv = sp_desktop_namedview(dt);
+ SPDocument *doc = SP_OBJECT_DOCUMENT(nv);
if (dt == NULL || nv == NULL) {
g_warning("No desktop or namedview specified (in toggle_snap_callback)!");
@@ -1899,6 +1900,9 @@ void toggle_snap_callback (GtkToggleAction *act, gpointer data) { //data points
return;
}
+ bool saved = sp_document_get_undo_sensitive(doc);
+ sp_document_set_undo_sensitive(doc, false);
+
bool v = false;
SPAttributeEnum attr = (SPAttributeEnum) GPOINTER_TO_INT(g_object_get_data(G_OBJECT(act), "SP_ATTR_INKSCAPE"));
@@ -1980,8 +1984,9 @@ void toggle_snap_callback (GtkToggleAction *act, gpointer data) { //data points
}
// The snapping preferences are stored in the document, and therefore toggling makes the document dirty
- SPDocument *doc = SP_OBJECT_DOCUMENT(nv);
doc->setModifiedSinceSave();
+
+ sp_document_set_undo_sensitive(doc, saved);
}
void setup_snap_toolbox(GtkWidget *toolbox, SPDesktop *desktop)