diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-03-09 16:23:35 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-03-16 09:38:01 +0100 |
| commit | 7f4e5c8247987c54f4328cb74d8ad00ae474ee79 (patch) | |
| tree | 64ad3b0732e94696e133df9edb250414c9343b10 /drawinglayer | |
| parent | f030a7fa3ab8c65229cc3576000e41210ed2af49 (diff) | |
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
Diffstat (limited to 'drawinglayer')
| -rw-r--r-- | drawinglayer/source/processor2d/hittestprocessor2d.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
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() * |