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

[Michael Meeks (via logerrit)]

 loleaflet/src/map/Map.js |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 9afbe35d0d30bbb20d1c2ed62af026d692301194
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Sat Dec 7 19:36:45 2019 +0000
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Sat Dec 7 19:41:51 2019 +0000

    zoom: while we are in a zoom animation use the target zoom.
    
    Avoid race-condition scaling twips co-ordinates during a zoom to
    a level that fails to match the core's understanding.
    
    Fixes a race with other view's cursor positioning being reported
    fast in new view twips, before the animation completes to that zoom.
    
    Also fixes a writer zoom issue whereby you could get tiles at multiple
    different zoom levels overlayed for parts of the screen when using
    scroll-wheel zoom and panning fast.
    
    Change-Id: I865920aa13715b852e14ab23f96781e076096808

diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 9554e3386..908e1f1fc 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -706,7 +706,10 @@ L.Map = L.Evented.extend({
 	},
 
 	getZoom: function () {
-		return this._zoom;
+		if (this._animatingZoom) // use animation target zoom
+			return this._animateToZoom;
+		else
+			return this._zoom;
 	},
 
 	getBounds: function () {