diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-03-06 18:23:58 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-03-09 10:16:18 +0100 |
| commit | 658f762dcdb80e73fc9007756f9dff801d3bd452 (patch) | |
| tree | 2f108f9b3070568e186ec45e76a98245508c272e | |
| parent | 7c1a2289d55aa9f92286c2c9eee0a394e9ea7d29 (diff) | |
sdr::overlay::OverlayObjectList: when tiled rendering, don't work with pixels
Change-Id: Iaf7c31db65ecc4945f9d19e9031632443fa3823f
| -rw-r--r-- | include/svx/sdr/overlay/overlayobjectlist.hxx | 1 | ||||
| -rw-r--r-- | svx/source/sdr/overlay/overlayobjectlist.cxx | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/include/svx/sdr/overlay/overlayobjectlist.hxx b/include/svx/sdr/overlay/overlayobjectlist.hxx index a3bda78589cd..57f68604147c 100644 --- a/include/svx/sdr/overlay/overlayobjectlist.hxx +++ b/include/svx/sdr/overlay/overlayobjectlist.hxx @@ -27,6 +27,7 @@ #define DEFAULT_VALUE_FOR_HITTEST_PIXEL (2L) +#define DEFAULT_VALUE_FOR_HITTEST_TWIP (30L) diff --git a/svx/source/sdr/overlay/overlayobjectlist.cxx b/svx/source/sdr/overlay/overlayobjectlist.cxx index 5b949c3be81a..16c9264f1b42 100644 --- a/svx/source/sdr/overlay/overlayobjectlist.cxx +++ b/svx/source/sdr/overlay/overlayobjectlist.cxx @@ -19,6 +19,7 @@ #include <svx/sdr/overlay/overlayobjectlist.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> +#include <svx/svdmodel.hxx> #include <vcl/outdev.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <tools/gen.hxx> @@ -72,8 +73,13 @@ namespace sdr { if(0.0 == fLogicTolerance) { - const Size aSizeLogic(pManager->getOutputDevice().PixelToLogic( + Size aSizeLogic(pManager->getOutputDevice().PixelToLogic( Size(DEFAULT_VALUE_FOR_HITTEST_PIXEL, DEFAULT_VALUE_FOR_HITTEST_PIXEL))); + + // When tiled rendering, we always work in twips, use the non-pixel default. + if (pManager->getModel()->isTiledRendering()) + aSizeLogic = Size(DEFAULT_VALUE_FOR_HITTEST_TWIP, DEFAULT_VALUE_FOR_HITTEST_TWIP); + fLogicTolerance = aSizeLogic.Width(); } |