on_canvas_set();
}
+// when a pastecanvas that contains another pastecanvas is copy/pasted
+// from one document to another, only the outermost pastecanvas was
+// getting its renddesc set to match that of its new parent. this
+// function is used to recurse through the pastecanvas copying its
+// renddesc to any pastecanvases it contains (bug #2116947, svn r2200)
+void
+Layer_PasteCanvas::update_renddesc()
+{
+ if(!get_canvas() || !canvas || !canvas->is_inline()) return;
+
+ canvas->rend_desc()=get_canvas()->rend_desc();
+ for (Context context = canvas->get_context(); !context->empty(); context++)
+ {
+ etl::handle<Layer_PasteCanvas> paste = etl::handle<Layer_PasteCanvas>::cast_dynamic(*context);
+ if (paste) paste->update_renddesc();
+ }
+}
+
// This is called whenever the parent canvas gets set/changed
void
Layer_PasteCanvas::on_canvas_set()
if (blend_method==Color::BLEND_COMPOSITE) blend_using_straight = true;
}
- if (!etl::intersect(context.get_full_bounding_rect(),full_bounding_rect+origin))
+ if (!etl::intersect(context.get_full_bounding_rect(),(full_bounding_rect*exp(zoom))+origin))
{
- // if there's no intersection between the context and our surface, and we're rendering 'onto', then we're done
- if (Color::is_onto(blend_method)) return true;
+ // if there's no intersection between the context and our
+ // surface, and we're rendering 'onto', then we're done
+ if (Color::is_onto(blend_method) && !Color::is_straight(blend_method))
+ return true;
/* 'straight' is faster than 'composite' and has the same
* effect if the affected area of the lower layer is