diff options
| author | Marc Jeanmougin <marc@jeanmougin.fr> | 2016-11-06 22:07:52 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marcjeanmougin@free.fr> | 2016-11-06 22:07:52 +0000 |
| commit | 9fa25f65a98bbd4abd3673b968ed5252cf9f14b3 (patch) | |
| tree | 8d7a8bb5db62bce3ed50563f2c44dd6fcb83e512 /src/object-set.h | |
| parent | Fix some bugs on pen/cil dropdown shapes (diff) | |
| parent | Fix selection issue with ObjectSet::unlinkRecursive() and add tests for it. (diff) | |
| download | inkscape-9fa25f65a98bbd4abd3673b968ed5252cf9f14b3.tar.gz inkscape-9fa25f65a98bbd4abd3673b968ed5252cf9f14b3.zip | |
merge recursive unlink clones branch
(bzr r15220)
Diffstat (limited to 'src/object-set.h')
| -rw-r--r-- | src/object-set.h | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/object-set.h b/src/object-set.h index 47a2efb9d..12f2cb101 100644 --- a/src/object-set.h +++ b/src/object-set.h @@ -330,7 +330,19 @@ public: void deleteItems(); void duplicate(bool suppressDone = false, bool duplicateLayer = false); void clone(); - void unlink(); + + /** + * @brief Unlink all directly selected clones. + * @param skip_undo If this is set to true the call to DocumentUndo::done is omitted. + * @return True if anything was unlinked, otherwise false. + */ + bool unlink(const bool skip_undo = false); + /** + * @brief Recursively unlink any clones present in the current selection, + * including clones which are used to clip other objects, groups of clones etc. + * @return true if anything was unlinked, otherwise false. + */ + bool unlinkRecursive(const bool skip_undo = false); void relink(); void cloneOriginal(); void cloneOriginalPathLPE(); @@ -376,7 +388,7 @@ public: void createBitmapCopy(); void setMask(bool apply_clip_path, bool apply_to_layer = false, bool skip_undo = false); void editMask(bool clip); - void unsetMask(bool apply_clip_path); + void unsetMask(const bool apply_clip_path, const bool skip_undo = false); void setClipGroup(); // moves |