diff options
| author | Marc Jeanmougin <marcjeanmougin@free.fr> | 2017-12-29 10:53:23 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marcjeanmougin@free.fr> | 2017-12-29 11:00:11 +0000 |
| commit | 0beb22fa8cdd81f9df78284e93747f52275ee887 (patch) | |
| tree | 497b207d5867610163fd2d80262befefff62deea | |
| parent | Merge branch 'master' of gitlab.com:inkscape/inkscape (diff) | |
| download | inkscape-0beb22fa8cdd81f9df78284e93747f52275ee887.tar.gz inkscape-0beb22fa8cdd81f9df78284e93747f52275ee887.zip | |
Revert "Add improvements sugested by Eduard Brawn And Moini"
This reverts commit 2ebc7ad774aa6fd19c684464e35ce9129f8ae341
(cherry picked from commit 8707b5a3d717bec232c74ea8ceb350ec14965877)
| -rw-r--r-- | src/splivarot.cpp | 10 | ||||
| -rw-r--r-- | src/verbs.cpp | 10 |
2 files changed, 3 insertions, 17 deletions
diff --git a/src/splivarot.cpp b/src/splivarot.cpp index 40a2a8993..f6544872f 100644 --- a/src/splivarot.cpp +++ b/src/splivarot.cpp @@ -310,7 +310,7 @@ Geom::PathVector pathliv_to_pathvector(Path *pathliv){ // take the source paths from the file, do the operation, delete the originals and add the results BoolOpErrors Inkscape::ObjectSet::pathBoolOp(bool_op bop, const bool skip_undo, const unsigned int verb, const Glib::ustring description) { - if (nullptr != desktop()) { + if (nullptr != desktop() && !skip_undo) { SPDocument *doc = desktop()->getDocument(); BoolOpErrors returnCode = ObjectSet::pathBoolOp(bop, true); switch(returnCode) { @@ -327,14 +327,10 @@ BoolOpErrors Inkscape::ObjectSet::pathBoolOp(bool_op bop, const bool skip_undo, boolop_display_error_message(desktop(), _("Unable to determine the <b>z-order</b> of the objects selected for difference, XOR, division, or path cut.")); break; case DONE_NO_PATH: - if (!skip_undo) { - DocumentUndo::done(doc, SP_VERB_NONE, description); - } + DocumentUndo::done(doc, SP_VERB_NONE, description); break; case DONE: - if (!skip_undo) { - DocumentUndo::done(doc, verb, description); - } + DocumentUndo::done(doc, verb, description); break; } return returnCode; diff --git a/src/verbs.cpp b/src/verbs.cpp index 08a3bb5a0..212fcf357 100644 --- a/src/verbs.cpp +++ b/src/verbs.cpp @@ -1233,36 +1233,28 @@ void SelectionVerb::perform(SPAction *action, void *data) break; case SP_VERB_SELECTION_OFFSET: - selection->toCurves(true); sp_selected_path_offset(dt); break; case SP_VERB_SELECTION_OFFSET_SCREEN: - selection->toCurves(true); sp_selected_path_offset_screen(dt, 1); break; case SP_VERB_SELECTION_OFFSET_SCREEN_10: - selection->toCurves(true); sp_selected_path_offset_screen(dt, 10); break; case SP_VERB_SELECTION_INSET: - selection->toCurves(true); sp_selected_path_inset(dt); break; case SP_VERB_SELECTION_INSET_SCREEN: - selection->toCurves(true); sp_selected_path_inset_screen(dt, 1); break; case SP_VERB_SELECTION_INSET_SCREEN_10: - selection->toCurves(true); sp_selected_path_inset_screen(dt, 10); break; case SP_VERB_SELECTION_DYNAMIC_OFFSET: - selection->toCurves(true); sp_selected_path_create_offset_object_zero(dt); tools_switch(dt, TOOLS_NODES); break; case SP_VERB_SELECTION_LINKED_OFFSET: - selection->toCurves(true); sp_selected_path_create_updating_offset_object_zero(dt); tools_switch(dt, TOOLS_NODES); break; @@ -1274,11 +1266,9 @@ void SelectionVerb::perform(SPAction *action, void *data) sp_selected_path_outline(dt, true); break; case SP_VERB_SELECTION_SIMPLIFY: - selection->toCurves(true); sp_selected_path_simplify(dt); break; case SP_VERB_SELECTION_REVERSE: - selection->toCurves(true); SelectionHelper::reverse(dt); break; |