diff --git a/src/layer-fns.cpp b/src/layer-fns.cpp
index c143336cc26a273f622b884f3a2f5b6742774d41..75bb89bcf65f49f1d07d542a94839adc7f98f178 100644 (file)
--- a/src/layer-fns.cpp
+++ b/src/layer-fns.cpp
#include "sp-item-group.h"
#include "xml/repr.h"
#include "algorithms/find-last-if.h"
+#include "layer-fns.h"
namespace Inkscape {
-/**
- * Creates a new layer. Advances to the next layer id indicated
- * by the string "layerNN", then creates a new group object of
- * that id with attribute inkscape:groupmode='layer', and finally
- * appends the new group object to \a root after object \a layer.
- *
- * \pre \a root should be either \a layer or an ancestor of it
- */
-SPObject *create_layer(SPObject *root, SPObject *layer) {
- SPDocument *document=SP_OBJECT_DOCUMENT(root);
-
- static int layer_suffix=1;
- gchar *id=NULL;
- do {
- g_free(id);
- id = g_strdup_printf("layer%d", layer_suffix++);
- } while (document->getObjectById(id));
-
- Inkscape::XML::Node *repr=sp_repr_new("svg:g");
- repr->setAttribute("inkscape:groupmode", "layer");
- repr->setAttribute("id", id);
- g_free(id);
-
- if ( root == layer ) {
- SP_OBJECT_REPR(root)->appendChild(repr);
- } else {
- Inkscape::XML::Node *layer_repr=SP_OBJECT_REPR(layer);
- sp_repr_parent(layer_repr)->addChild(repr, layer_repr);
- }
-
- return document->getObjectByRepr(repr);
-}
-
namespace {
bool is_layer(SPObject &object) {
SP_GROUP(&object)->layerMode() == SPGroup::LAYER;
}
+/** Finds the next sibling layer for a \a layer
+ *
+ * @returns NULL if there are no further layers under a parent
+ */
SPObject *next_sibling_layer(SPObject *layer) {
using std::find_if;
);
}
+/** Finds the previous sibling layer for a \a layer
+ *
+ * @returns NULL if there are no further layers under a parent
+ */
SPObject *previous_sibling_layer(SPObject *layer) {
using Inkscape::Algorithms::find_last_if;
return ( sibling != layer ) ? sibling : NULL;
}
+/** Finds the first child of a \a layer
+ *
+ * @returns NULL if layer has no sublayers
+ */
SPObject *first_descendant_layer(SPObject *layer) {
using std::find_if;
return first_descendant;
}
+/** Finds the last (topmost) child of a \a layer
+ *
+ * @returns NULL if layer has no sublayers
+ */
SPObject *last_child_layer(SPObject *layer) {
using Inkscape::Algorithms::find_last_if;
return NULL;
}
+/**
+* Creates a new layer. Advances to the next layer id indicated
+ * by the string "layerNN", then creates a new group object of
+ * that id with attribute inkscape:groupmode='layer', and finally
+ * appends the new group object to \a root after object \a layer.
+ *
+ * \pre \a root should be either \a layer or an ancestor of it
+ */
+SPObject *create_layer(SPObject *root, SPObject *layer, LayerRelativePosition position) {
+ SPDocument *document=SP_OBJECT_DOCUMENT(root);
+
+ static int layer_suffix=1;
+ gchar *id=NULL;
+ do {
+ g_free(id);
+ id = g_strdup_printf("layer%d", layer_suffix++);
+ } while (document->getObjectById(id));
+
+ Inkscape::XML::Document *xml_doc = sp_document_repr_doc(document);
+ Inkscape::XML::Node *repr = xml_doc->createElement("svg:g");
+ repr->setAttribute("inkscape:groupmode", "layer");
+ repr->setAttribute("id", id);
+ g_free(id);
+
+ if ( LPOS_CHILD == position ) {
+ root = layer;
+ SPObject *child_layer = Inkscape::last_child_layer(layer);
+ if ( NULL != child_layer ) {
+ layer = child_layer;
+ }
+ }
+
+ if ( root == layer ) {
+ SP_OBJECT_REPR(root)->appendChild(repr);
+ } else {
+ Inkscape::XML::Node *layer_repr=SP_OBJECT_REPR(layer);
+ sp_repr_parent(layer_repr)->addChild(repr, layer_repr);
+
+ if ( LPOS_BELOW == position ) {
+ SP_ITEM(document->getObjectByRepr(repr))->lowerOne();
+ }
+ }
+
+ return document->getObjectByRepr(repr);
+}
+
}
/*