diff options
| author | Ptyl Dragon <ptyl@cloudon.com> | 2013-11-01 12:51:51 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2013-11-15 16:52:00 +0100 |
| commit | 427c55bbc1e16f5aaf74dca67c1ea6436f1032a1 (patch) | |
| tree | 53fee898903b75b7f89cbca94a098b6d6598376f /sw | |
| parent | 5c6aa9ae862d2483355613b8c2e3e33d61140068 (diff) | |
removed DPX RIP (0,0) coords shift. played with rendering parameters
Change-Id: Ib2a3b017aa59bc1a8408b42f101fd041270494aa
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/view/viewsh.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index eda5be10fe0f..2706c67a331c 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -1808,10 +1808,11 @@ void touch_lo_draw_tile(void *context, int contextWidth, int contextHeight, MLOD aMapMode.SetScaleX(scaleX); aMapMode.SetScaleY(scaleY); aDevice.SetMapMode(aMapMode); + SetSwVisArea( pViewShell, SwRect(Point(tilePosX, tilePosY), Size(tileWidth, tileHeight)) ); // resizes the virtual device so to contain the entrie context aDevice.SetOutputSizePixel(Size(contextWidth, contextHeight)); // draw - works in logic coordinates - pViewShell->PaintTile(&aDevice, Rectangle(Point(tilePosX, tilePosY), Size(tileWidth, tileHeight))); + pViewShell->PaintTile(&aDevice, Rectangle(Point(0, 0), Size(tileWidth, tileHeight))); // copy the aDevice content to mpImage Bitmap aBitmap(aDevice.GetBitmap(aDevice.PixelToLogic(Point(0,0)), aDevice.PixelToLogic(Size(contextWidth, contextHeight)))); BitmapReadAccess * readAccess = aBitmap.AcquireReadAccess(); @@ -1843,8 +1844,8 @@ MLODpxSize touch_lo_get_content_size() extern "C" MLORipPoint MLORipPointByDpxPoint(MLODpxPoint mloDpxPoint) { - MLODpxSize contentSize = touch_lo_get_content_size(); - MLORip x = MLORipByDpx(mloDpxPoint.x - (contentSize.width/2.0f)); + //MLODpxSize contentSize = touch_lo_get_content_size(); + MLORip x = MLORipByDpx(mloDpxPoint.x /*- (contentSize.width/2.0f)*/); MLORip y = MLORipByDpx(mloDpxPoint.y); return MLORipPointByRips(x,y); } @@ -1852,8 +1853,8 @@ MLORipPoint MLORipPointByDpxPoint(MLODpxPoint mloDpxPoint) extern "C" MLODpxPoint MLODpxPointByRipPoint(MLORipPoint mloRipPoint) { - MLODpxSize contentSize = touch_lo_get_content_size(); - MLODpx x = MLODpxByRip(mloRipPoint.x) + (contentSize.width/2.0f); + //MLODpxSize contentSize = touch_lo_get_content_size(); + MLODpx x = MLODpxByRip(mloRipPoint.x)/* + (contentSize.width/2.0f)*/; MLODpx y = MLODpxByRip(mloRipPoint.y); return MLODpxPointByDpxes(x,y); } |