summaryrefslogtreecommitdiffstats
path: root/src/display/drawing-shape.cpp
diff options
context:
space:
mode:
authorTavmjong Bah <tavmjong@free.fr>2014-12-21 14:29:02 +0000
committertavmjong-free <tavmjong@free.fr>2014-12-21 14:29:02 +0000
commitb6d303d11e572d8888d29c44e11d06d256821a03 (patch)
tree715b43f92a002f4c2a3bdadc7fb10675b60d85eb /src/display/drawing-shape.cpp
parentdisable rev 13709, following Bug 1365451, comments 13-16 (diff)
downloadinkscape-b6d303d11e572d8888d29c44e11d06d256821a03.tar.gz
inkscape-b6d303d11e572d8888d29c44e11d06d256821a03.zip
Implement rendering for 'context-fill' and 'context-stroke' (text not handled yet).
(bzr r13807)
Diffstat (limited to 'src/display/drawing-shape.cpp')
-rw-r--r--src/display/drawing-shape.cpp14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/display/drawing-shape.cpp b/src/display/drawing-shape.cpp
index 5bdc7a323..63efb3c0d 100644
--- a/src/display/drawing-shape.cpp
+++ b/src/display/drawing-shape.cpp
@@ -62,10 +62,17 @@ DrawingShape::setPath(SPCurve *curve)
}
void
-DrawingShape::setStyle(SPStyle *style)
+DrawingShape::setStyle(SPStyle *style, SPStyle *context_style)
{
- _nrstyle.set(style);
- DrawingItem::setStyle(style);
+ DrawingItem::setStyle(style, context_style); // Must be first
+ _nrstyle.set(_style, _context_style);
+}
+
+void
+DrawingShape::setChildrenStyle(SPStyle* context_style)
+{
+ DrawingItem::setChildrenStyle( context_style );
+ _nrstyle.set(_style, _context_style);
}
unsigned
@@ -142,7 +149,6 @@ DrawingShape::_updateItem(Geom::IntRect const &area, UpdateContext const &ctx, u
_bbox.unionWith(i->geometricBounds());
}
}
-
return STATE_ALL;
}