diff options
| author | Martin Owens <doctormo@gmail.com> | 2014-01-21 15:21:10 +0000 |
|---|---|---|
| committer | Martin Owens <doctormo@gmail.com> | 2014-01-21 15:21:10 +0000 |
| commit | 29e005620b05165ffd5ad21c2a9751adac89d34a (patch) | |
| tree | c1c212cb5327fdc8f0dc10e4cfd5a1f38bfce4ed /src/selection-chemistry.cpp | |
| parent | Revert last commit (breaks changing document units). (diff) | |
| download | inkscape-29e005620b05165ffd5ad21c2a9751adac89d34a.tar.gz inkscape-29e005620b05165ffd5ad21c2a9751adac89d34a.zip | |
Move dragging undo block from tools-base to canvas. Regarding bug #168695
(bzr r12967)
Diffstat (limited to 'src/selection-chemistry.cpp')
| -rw-r--r-- | src/selection-chemistry.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp index 1957b9297..3082a2fe4 100644 --- a/src/selection-chemistry.cpp +++ b/src/selection-chemistry.cpp @@ -56,6 +56,7 @@ SPCycleType SP_CYCLING = SP_CYCLE_FOCUS; #include "sp-polyline.h" #include "sp-line.h" #include "text-editing.h" +#include "display/sp-canvas.h" #include "ui/tools/text-tool.h" #include "ui/tools/connector-tool.h" #include "sp-path.h" @@ -1084,7 +1085,7 @@ void sp_undo(SPDesktop *desktop, SPDocument *) { // No re/undo while dragging, too dangerous. - if(desktop->getEventContext()->is_dragging) return; + if(desktop->getCanvas()->is_dragging) return; if (!DocumentUndo::undo(sp_desktop_document(desktop))) { desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Nothing to undo.")); @@ -1095,7 +1096,7 @@ void sp_redo(SPDesktop *desktop, SPDocument *) { // No re/undo while dragging, too dangerous. - if(desktop->getEventContext()->is_dragging) return; + if(desktop->getCanvas()->is_dragging) return; if (!DocumentUndo::redo(sp_desktop_document(desktop))) { desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Nothing to redo.")); |