diff options
Diffstat (limited to 'src/marker.h')
| -rw-r--r-- | src/marker.h | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/src/marker.h b/src/marker.h index 831b298ac..585615476 100644 --- a/src/marker.h +++ b/src/marker.h @@ -29,10 +29,10 @@ struct SPMarkerView; #include "svg/svg-length.h" #include "enums.h" #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 +54,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 +64,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; @@ -97,7 +87,7 @@ Inkscape::DrawingItem *sp_marker_show_instance (SPMarker *marker, Inkscape::Draw unsigned int key, unsigned int pos, Geom::Affine const &base, float linewidth); void sp_marker_hide (SPMarker *marker, unsigned int key); -const gchar *generate_marker (GSList *reprs, Geom::Rect bounds, SPDocument *document, Geom::Affine transform, Geom::Affine move); +const gchar *generate_marker (GSList *reprs, Geom::Rect bounds, SPDocument *document, Geom::Point center, Geom::Affine move); SPObject *sp_marker_fork_if_necessary(SPObject *marker); #endif |