diff options
| author | bulia byak <buliabyak@gmail.com> | 2007-03-03 03:42:31 +0000 |
|---|---|---|
| committer | buliabyak <buliabyak@users.sourceforge.net> | 2007-03-03 03:42:31 +0000 |
| commit | 8c659759b0892dccd08210ad9ad83401e9332d90 (patch) | |
| tree | 77bb8f6abee9df06795809c1f2733ceb1df05f7c /src/display | |
| parent | decouple click and drag release handlers to fix bug where zooming in by middl... (diff) | |
| download | inkscape-8c659759b0892dccd08210ad9ad83401e9332d90.tar.gz inkscape-8c659759b0892dccd08210ad9ad83401e9332d90.zip | |
restore rendering markers in outline mode
(bzr r2512)
Diffstat (limited to 'src/display')
| -rw-r--r-- | src/display/nr-arena-shape.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/display/nr-arena-shape.cpp b/src/display/nr-arena-shape.cpp index b8bfee05c..b9a7fc737 100644 --- a/src/display/nr-arena-shape.cpp +++ b/src/display/nr-arena-shape.cpp @@ -853,10 +853,13 @@ nr_arena_shape_render(cairo_t *ct, NRArenaItem *item, NRRectL *area, NRPixBlock bool outline = (NR_ARENA_ITEM(shape)->arena->rendermode == RENDERMODE_OUTLINE); - if (outline) { + if (outline) { // cairo outline rendering + pb->empty = FALSE; - return cairo_arena_shape_render_outline (ct, item, NR::Point(pb->area.x0, pb->area.y0)); - } + unsigned int ret = cairo_arena_shape_render_outline (ct, item, NR::Point(pb->area.x0, pb->area.y0)); + if (ret & NR_ARENA_ITEM_STATE_INVALID) return ret; + + } else { if ( shape->delayed_shp ) { if ( nr_rect_l_test_intersect(area, &item->bbox) ) { @@ -972,10 +975,11 @@ nr_arena_shape_render(cairo_t *ct, NRArenaItem *item, NRRectL *area, NRPixBlock nr_pixblock_release(&m); } - /* Just compose children into parent buffer */ + } // non-cairo non-outline branch + + /* Render markers into parent buffer */ for (NRArenaItem *child = shape->markers; child != NULL; child = child->next) { - unsigned int ret; - ret = nr_arena_item_invoke_render(ct, child, area, pb, flags); + unsigned int ret = nr_arena_item_invoke_render(ct, child, area, pb, flags); if (ret & NR_ARENA_ITEM_STATE_INVALID) return ret; } |