[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - sc/source

[Szymon Kłos (via logerrit)]

 sc/source/ui/view/gridwin4.cxx |   13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

New commits:
commit 7260b8724fafd41294761382f69ece7fe09588c4
Author:     Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Fri May 13 17:06:19 2022 +0200
Commit:     Henry Castro <hcas...@collabora.com>
CommitDate: Mon May 16 21:35:17 2022 +0200

    lok: respect zoom in calc tile rendering of EditView
    
    Issue was that when using 150% zoom in LOK and editing
    some textbox inside Calc spreadsheet - we didn't see
    content of it (but tiles were invalidated).
    In other view we have seen textbox in correct place
    if zoom was 100%.
    
    To fix that we need to pass zoom factor and use it.
    
    Change-Id: Ib1cf49af02d0637e09ce68c5c2c41ffb3014c701
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134288
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Mert Tumer <mert.tu...@collabora.com>
    Reviewed-by: Henry Castro <hcas...@collabora.com>

diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 3baf4d0c96a3..2580b25fafd2 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -726,7 +726,8 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice, const 
ScTableInfo& rTableI
         // the same as editeng and drawinglayer), and get rid of all the
         // SetMapMode's and other unnecessary fun we have with pixels
         // See also ScGridWindow::GetDrawMapMode() for the rest of this hack
-        aDrawMode.SetOrigin(PixelToLogic(Point(nScrX, nScrY), aDrawMode));
+        aDrawMode.SetOrigin(PixelToLogic(Point(tools::Long(nScrX / 
aOutputData.aZoomX),
+                                               tools::Long(nScrY / 
aOutputData.aZoomY)), aDrawMode));
     }
     tools::Rectangle aDrawingRectLogic;
     bool bLayoutRTL = rDoc.IsLayoutRTL( nTab );
@@ -1027,6 +1028,9 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice, 
const ScTableInfo& rTableI
 
             if (bIsTiledRendering)
             {
+                const double fZoomX = static_cast<double>(aOutputData.aZoomX);
+                const double fZoomY = static_cast<double>(aOutputData.aZoomY);
+
                 Point aOrigin = aOriginalMode.GetOrigin();
                 if (bLayoutRTL)
                     aOrigin.setX(-aOrigin.getX() / TWIPS_PER_PIXEL + 
aOutputData.nScrX + aOutputData.GetScrW());
@@ -1034,9 +1038,10 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice, 
const ScTableInfo& rTableI
                     aOrigin.setX(aOrigin.getX() / TWIPS_PER_PIXEL + 
aOutputData.nScrX);
 
                 aOrigin.setY(aOrigin.getY() / TWIPS_PER_PIXEL + 
aOutputData.nScrY);
+
                 const double twipFactor = 15 * 1.76388889; // 26.45833335
-                aOrigin = Point(aOrigin.getX() * twipFactor,
-                                aOrigin.getY() * twipFactor);
+                aOrigin = Point(aOrigin.getX() * twipFactor / fZoomX,
+                                aOrigin.getY() * twipFactor / fZoomY);
                 MapMode aNew = rDevice.GetMapMode();
                 aNew.SetOrigin(aOrigin);
                 rDevice.SetMapMode(aNew);
@@ -1558,7 +1563,7 @@ void ScGridWindow::PaintTile( VirtualDevice& rDevice,
                              -nTopLeftTileRowOffset,
                              nTopLeftTileCol, nTopLeftTileRow,
                              nBottomRightTileCol, nBottomRightTileRow,
-                             fPPTX, fPPTY, nullptr, nullptr);
+                             fPPTX, fPPTY, &aFracX, &aFracY);
 
     // setup the SdrPage so that drawinglayer works correctly
     ScDrawLayer* pModel = rDoc.GetDrawLayer();