diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2014-02-08 19:12:21 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2014-02-08 19:12:21 +0000 |
| commit | 0912ab9a77d4b3f26975f3ca94e14ee72b63d6b6 (patch) | |
| tree | c9342a4d89751b8157c9fe8f9cdd9404114aaae0 /src/marker.h | |
| parent | update to trunk (diff) | |
| parent | Fix for Bug #879058 (Spray Single Path Mode includes original object). (diff) | |
| download | inkscape-0912ab9a77d4b3f26975f3ca94e14ee72b63d6b6.tar.gz inkscape-0912ab9a77d4b3f26975f3ca94e14ee72b63d6b6.zip | |
update to trunk
(bzr r11950.1.250)
Diffstat (limited to 'src/marker.h')
| -rw-r--r-- | src/marker.h | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/marker.h b/src/marker.h index b780950de..21ad63a41 100644 --- a/src/marker.h +++ b/src/marker.h @@ -31,8 +31,9 @@ struct SPMarkerView; #include "sp-item-group.h" #include "sp-marker-loc.h" #include "uri-references.h" +#include "viewbox.h" -class SPMarker : public SPGroup { +class SPMarker : public SPGroup, public SPViewBox { public: SPMarker(); virtual ~SPMarker(); @@ -54,17 +55,6 @@ public: unsigned int orient_auto : 1; float orient; - /* viewBox; */ - Geom::OptRect viewBox; - - /* preserveAspectRatio */ - unsigned int aspect_set : 1; - unsigned int aspect_align : 4; - unsigned int aspect_clip : 1; - - /* Child to parent additional transform */ - Geom::Affine c2p; - /* Private views */ SPMarkerView *views; @@ -75,6 +65,7 @@ public: virtual Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags); virtual Inkscape::DrawingItem* show(Inkscape::Drawing &drawing, unsigned int key, unsigned int flags); + virtual Inkscape::DrawingItem* private_show(Inkscape::Drawing &drawing, unsigned int key, unsigned int flags); virtual void hide(unsigned int key); virtual Geom::OptRect bbox(Geom::Affine const &transform, SPItem::BBoxType type) const; |