From 7f4e5c8247987c54f4328cb74d8ad00ae474ee79 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Mon, 9 Mar 2015 16:23:35 +0100 Subject: drawinglayer::processor2d::HitTestProcessor2D: ignore pixel size of ... ... candidate when tiled rendering. Tiled rendering works entirely in twips, so pixel sizes are not relevant. One step closer to working image resizing in the tiled rendering case. Change-Id: I1d5e33071a383b333e0fdb9d30ea09fcea23a8fc --- drawinglayer/source/processor2d/hittestprocessor2d.cxx | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'drawinglayer/source') diff --git a/drawinglayer/source/processor2d/hittestprocessor2d.cxx b/drawinglayer/source/processor2d/hittestprocessor2d.cxx index 3c0fe379c1e7..4c5602d118d5 100644 --- a/drawinglayer/source/processor2d/hittestprocessor2d.cxx +++ b/drawinglayer/source/processor2d/hittestprocessor2d.cxx @@ -42,14 +42,16 @@ namespace drawinglayer HitTestProcessor2D::HitTestProcessor2D(const geometry::ViewInformation2D& rViewInformation, const basegfx::B2DPoint& rLogicHitPosition, double fLogicHitTolerance, - bool bHitTextOnly) + bool bHitTextOnly, + bool bTiledRendering) : BaseProcessor2D(rViewInformation), maDiscreteHitPosition(), mfDiscreteHitTolerance(0.0), mbHit(false), mbHitToleranceUsed(false), mbUseInvisiblePrimitiveContent(true), - mbHitTextOnly(bHitTextOnly) + mbHitTextOnly(bHitTextOnly), + mbTiledRendering(bTiledRendering) { // init hit tolerance mfDiscreteHitTolerance = fLogicHitTolerance; @@ -483,7 +485,8 @@ namespace drawinglayer const BitmapEx& rBitmapEx = rBitmapCandidate.getBitmapEx(); const Size& rSizePixel(rBitmapEx.GetSizePixel()); - if(rSizePixel.Width() && rSizePixel.Height()) + // When tiled rendering, don't bother with the pixel size of the candidate. + if(rSizePixel.Width() && rSizePixel.Height() && !mbTiledRendering) { basegfx::B2DHomMatrix aBackTransform( getViewInformation2D().getObjectToViewTransformation() * -- cgit