diff options
| author | bulia byak <buliabyak@gmail.com> | 2007-07-04 01:30:14 +0000 |
|---|---|---|
| committer | buliabyak <buliabyak@users.sourceforge.net> | 2007-07-04 01:30:14 +0000 |
| commit | 2aaa984133a62ac2ab21658abc494ec5da3c8cc9 (patch) | |
| tree | 6793236709e7f0379e7fae56d86e118314546719 /src | |
| parent | switch fill/stroke paintservers to URIReferences, properly disconnect and del... (diff) | |
| download | inkscape-2aaa984133a62ac2ab21658abc494ec5da3c8cc9.tar.gz inkscape-2aaa984133a62ac2ab21658abc494ec5da3c8cc9.zip | |
adapt to new paintservers API of SPStyle
(bzr r3181)
Diffstat (limited to 'src')
| -rw-r--r-- | src/desktop-style.cpp | 7 | ||||
| -rw-r--r-- | src/display/nr-arena-shape.cpp | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp index 94221ba54..1634db367 100644 --- a/src/desktop-style.cpp +++ b/src/desktop-style.cpp @@ -37,7 +37,6 @@ #include "xml/repr.h" #include "libnrtype/font-style-to-pos.h" - #include "desktop-style.h" /** @@ -499,14 +498,14 @@ objects_query_fillstroke (GSList *objects, SPStyle *style_res, bool const isfill num ++; } + paint_res->type = paint->type; if (paint_res->set && paint_effectively_set && paint->type == SP_PAINT_TYPE_PAINTSERVER) { // copy the server if (isfill) { - SP_STYLE_FILL_SERVER (style_res) = SP_STYLE_FILL_SERVER (style); + sp_style_set_to_uri_string (style_res, true, style->getFillURI()); } else { - SP_STYLE_STROKE_SERVER (style_res) = SP_STYLE_STROKE_SERVER (style); + sp_style_set_to_uri_string (style_res, false, style->getStrokeURI()); } } - paint_res->type = paint->type; paint_res->set = paint_effectively_set; style_res->fill_rule.computed = style->fill_rule.computed; // no averaging on this, just use the last one } diff --git a/src/display/nr-arena-shape.cpp b/src/display/nr-arena-shape.cpp index a31363f9a..f0de2d26f 100644 --- a/src/display/nr-arena-shape.cpp +++ b/src/display/nr-arena-shape.cpp @@ -1282,7 +1282,7 @@ nr_arena_shape_set_style(NRArenaShape *shape, SPStyle *style) break; } case SP_PAINT_TYPE_PAINTSERVER: { - shape->setFill(style->fill.value.paint.server); + shape->setFill(style->getFillPaintServer()); break; } default: { @@ -1314,7 +1314,7 @@ nr_arena_shape_set_style(NRArenaShape *shape, SPStyle *style) break; } case SP_PAINT_TYPE_PAINTSERVER: { - shape->setStroke(style->stroke.value.paint.server); + shape->setStroke(style->getStrokePaintServer()); break; } default: { |