[Libreoffice-commits] online.git: 2 commits - loleaflet/src

[Michael Meeks (via logerrit)]

 loleaflet/src/layer/tile/CalcTileLayer.js   |    6 ++++--
 loleaflet/src/layer/tile/CanvasTileLayer.js |    1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit a5f44dfad8fb90e90d3c67fac0dec23537c10dc8
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Tue Sep 15 19:53:16 2020 +0100
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Thu Sep 17 21:34:43 2020 +0200

    calc grid: re-render the canvas when we get grid details.
    
    Change-Id: I3d1d1485e561d8c807daa0dfe0a9f2cb5651d31b
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102952
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/loleaflet/src/layer/tile/CanvasTileLayer.js b/loleaflet/src/layer/tile/CanvasTileLayer.js
index 4b0123ba2..b9700987c 100644
--- a/loleaflet/src/layer/tile/CanvasTileLayer.js
+++ b/loleaflet/src/layer/tile/CanvasTileLayer.js
@@ -375,6 +375,7 @@ L.CanvasTileLayer = L.TileLayer.extend({
 		}
 		this._map.on('resize zoomend', this._painter.update, this._painter);
 		this._map.on('splitposchanged', this._painter.update, this._painter);
+		this._map.on('sheetgeometrychanged', this._painter.update, this._painter);
 		this._map.on('move', this._syncTilePanePos, this);
 
 		this._map.on('viewrowcolumnheaders', this._updateRenderBackground, this);
commit b70d9f6c1052ed5a86f309032ed818861027b676
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Tue Sep 15 11:02:54 2020 +0100
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Thu Sep 17 21:34:35 2020 +0200

    calc grid: fix this interleaving.
    
    When the span starts in the middle of the view don't render backwards.
    
    Change-Id: Icc97fef88a65c0ca83167ddb72c03bece9a8e047
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102951
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/loleaflet/src/layer/tile/CalcTileLayer.js b/loleaflet/src/layer/tile/CalcTileLayer.js
index 439f0d8cd..ed7ab0d5d 100644
--- a/loleaflet/src/layer/tile/CalcTileLayer.js
+++ b/loleaflet/src/layer/tile/CalcTileLayer.js
@@ -1782,8 +1782,10 @@ L.SheetDimension = L.Class.extend({
 			    (spanData.data.sizecore * (spanData.end - spanData.start + 1));
 			if (spanFirstCorePx < endPix && spanData.data.poscorepx > startPix)
 			{
-				var firstCorePx = startPix + spanData.data.sizecore -
-				    ((startPix - spanFirstCorePx) % spanData.data.sizecore);
+				var firstCorePx = Math.max(
+					spanFirstCorePx,
+					startPix + spanData.data.sizecore -
+						((startPix - spanFirstCorePx) % spanData.data.sizecore));
 				var lastCorePx = Math.min(endPix, spanData.data.poscorepx);
 
 				for (var pos = firstCorePx; pos <= lastCorePx; pos += spanData.data.sizecore) {