[Libreoffice-commits] core.git: Branch 'feature/gtkbmptiledviewer2' - sw/source

[Andrzej Hunt]

 sw/source/core/view/viewsh.cxx |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit ffb8a9b355c1ec48a240b2ae2548e09013463030
Author: Andrzej Hunt <andrzej.hunt at collabora.com>
Date:   Fri Jun 13 10:43:07 2014 +0100

    Tiled Rendering: ensure rendered area is visible.
    
    MakeVisible only scrolls the view, so parts of the tile to be rendered
    might be outside the SwView's visible area, and therefore not painted.
    
    This however makes the background window (shown for the tilederendering
    app) unuseable (but that window is invisible for all practical uses
    of tiled rendering, and hence probably not a problem).
    
    Change-Id: I6c3c2846906163b362f7cff6d8c7ba308a58a7ad

diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 766a8ac..79bda49 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -1783,8 +1783,14 @@ void SwViewShell::PaintTile(VirtualDevice &rDevice, int contextWidth, int contex
         Imp()->GetDrawView()->AddWindowToPaintView(&rDevice);
     }
 
-    // scroll the requested area into view if necessary
-    MakeVisible(SwRect(Point(tilePosX, tilePosY), rDevice.PixelToLogic(Size(contextWidth, contextHeight))));
+    // 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))));
 
     // draw - works in logic coordinates
     Paint(Rectangle(Point(tilePosX, tilePosY), rDevice.PixelToLogic(Size(contextWidth, contextHeight))));