summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorAndrzej Hunt <andrzej.hunt@collabora.com>2014-07-24 14:34:49 +0200
committerAndrzej Hunt <andrzej.hunt@collabora.com>2014-07-26 15:42:03 +0200
commit7bf98caddda048db0f39048af178621294aa0665 (patch)
treec21f7891b27bcce18c383020d1465e2a83d57520 /sw/source
parent2d4037529bb5b831907eabb85650126349595cc9 (diff)
Revert "Tiled Rendering: ensure rendered area is visible."
This reverts commit ff6a38b76df80d0f907f2f92cb851dea43c91d81.
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/core/view/viewsh.cxx10
1 files changed, 2 insertions, 8 deletions
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 6571a5f09af7..6ffdbbf90937 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -1785,14 +1785,8 @@ void SwViewShell::PaintTile(VirtualDevice &rDevice, int contextWidth, int contex
Imp()->GetDrawView()->AddWindowToPaintView(&rDevice);
}
- // Make the requested area visible -- we can't use MakeVisible as that will
- // only scroll the contents, but won't zoom/resize if needed.
- // Without this, items/text that are outside the visible area (in the SwView)
- // won't be painted when rendering tiles (at least when using either the
- // tiledrendering app, or the gtktiledviewer) -- although ultimately we
- // probably want to fix things so that the SwView's area doesn't affect
- // tiled rendering?
- mpDoc->GetDocShell()->SetVisArea(Rectangle(Point(tilePosX, tilePosY), rDevice.PixelToLogic(Size(contextWidth, contextHeight))));
+ // scroll the requested area into view if necessary
+ MakeVisible(SwRect(Point(tilePosX, tilePosY), rDevice.PixelToLogic(Size(contextWidth, contextHeight))));
// draw - works in logic coordinates
Paint(Rectangle(Point(tilePosX, tilePosY), rDevice.PixelToLogic(Size(contextWidth, contextHeight))));