From 752f4aafca593b84195b3d13062a64437d0166c8 Mon Sep 17 00:00:00 2001 From: bulia byak Date: Wed, 14 Mar 2007 18:03:01 +0000 Subject: fix bug where master opacity did not affect markers (bzr r2645) --- src/display/nr-arena-shape.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/display/nr-arena-shape.cpp b/src/display/nr-arena-shape.cpp index afc30acb8..6aa259ba6 100644 --- a/src/display/nr-arena-shape.cpp +++ b/src/display/nr-arena-shape.cpp @@ -379,11 +379,12 @@ nr_arena_shape_update(NRArenaItem *item, NRRectL *area, NRGC *gc, guint state, g } item->render_opacity = FALSE; } - if ( item->render_opacity == TRUE - && shape->_fill.paint.type() != NRArenaShape::Paint::NONE - && shape->_stroke.paint.type() != NRArenaShape::Paint::NONE ) + if ( (shape->_fill.paint.type() != NRArenaShape::Paint::NONE && + shape->_stroke.paint.type() != NRArenaShape::Paint::NONE) + || (shape->markers) + ) { - // don't merge item opacity with paint opacity if there is a stroke on the fill + // don't merge item opacity with paint opacity if there is a stroke on the fill, or markers on stroke item->render_opacity = FALSE; } -- cgit v1.2.3