summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2013-11-03 22:46:38 +0200
committerJan Holesovsky <kendy@collabora.com>2013-11-15 16:52:04 +0100
commit69f4c14fb9a192a3424b917e7a280abb1a00c075 (patch)
tree0772f059b9de0a35c06e980861509d1209de6820 /sw
parentdf029acfb24e56fbadfcc383f3bb98f949bfbb2a (diff)
Make the scaling with the "tile/context" ratio optional, too
It just confuses things, for me at least... It's enough to keep the scaling from our "decitwips" to twips to pixels in your head. I am now finally starting to understand what is going on;) Change-Id: I0dca2722105914de41d1ce017410cb5a05cf32c4
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/view/viewsh.cxx14
1 files changed, 9 insertions, 5 deletions
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index a54a123cf1d2..7cb914fd0fc8 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -1803,11 +1803,15 @@ void touch_lo_draw_tile(void *context, int contextWidth, int contextHeight, MLOD
MapMode aMapMode(aDevice.GetMapMode());
aMapMode.SetMapUnit(MAP_TWIP);
aMapMode.SetOrigin(Point(-tilePosX, -tilePosY));
- // scaling
- Fraction scaleX(tileWidth,contextWidth);
- Fraction scaleY(tileHeight,contextHeight);
- aMapMode.SetScaleX(scaleX);
- aMapMode.SetScaleY(scaleY);
+ static bool bCallSetScale = getenv("CALLSETSCALE") != NULL;
+ if (bCallSetScale)
+ {
+ // scaling
+ Fraction scaleX(tileWidth,contextWidth);
+ Fraction scaleY(tileHeight,contextHeight);
+ aMapMode.SetScaleX(scaleX);
+ aMapMode.SetScaleY(scaleY);
+ }
aDevice.SetMapMode(aMapMode);
static bool bCallSetSwVisArea = getenv("CALLSETSWVISAREA") != NULL;
if (bCallSetSwVisArea)