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

[Dennis Francis (via logerrit)]

 loleaflet/src/layer/tile/CalcTileLayer.js |    1 +
 loleaflet/src/layer/tile/GridLayer.js     |    3 +++
 2 files changed, 4 insertions(+)

New commits:
commit 3af2346bbb97f9b8588099b2ab6d0eb9117c84b3
Author:     Dennis Francis <dennis.francis at collabora.com>
AuthorDate: Fri Jan 17 16:59:02 2020 +0530
Commit:     Dennis Francis <dennis.francis at collabora.com>
CommitDate: Sat Jan 18 17:42:24 2020 +0100

    Request comment positions when zooming/view reset
    
    The twips coordinates sent by core in CommentsPos message are already
    correct w.r.t zoom level (See ScModelObj::getPostItsPos() in core.git).
    In addition these values are view specific (each client user).
    
    Change-Id: I18c2971f34362de0eba5181f9dbe3e662c223575
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/86986
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/loleaflet/src/layer/tile/CalcTileLayer.js b/loleaflet/src/layer/tile/CalcTileLayer.js
index a1847dd8e..697622b35 100644
--- a/loleaflet/src/layer/tile/CalcTileLayer.js
+++ b/loleaflet/src/layer/tile/CalcTileLayer.js
@@ -577,6 +577,7 @@ L.CalcTileLayer = L.TileLayer.extend({
 		this._sendClientZoom();
 		// TODO: test it!
 		this._map.fire('updaterowcolumnheaders');
+		this._map._socket.sendMessage('commandvalues command=.uno:ViewAnnotationsPosition');
 	},
 
 	_onUpdateCurrentHeader: function() {
diff --git a/loleaflet/src/layer/tile/GridLayer.js b/loleaflet/src/layer/tile/GridLayer.js
index 4db50a473..ee8b4c9de 100644
--- a/loleaflet/src/layer/tile/GridLayer.js
+++ b/loleaflet/src/layer/tile/GridLayer.js
@@ -322,6 +322,9 @@ L.GridLayer = L.Layer.extend({
 
 	_viewReset: function (e) {
 		this._reset(this._map.getCenter(), this._map.getZoom(), e && e.hard);
+		if (this._docType === 'spreadsheet' && this._annotations !== 'undefined') {
+			this._map._socket.sendMessage('commandvalues command=.uno:ViewAnnotationsPosition');
+		}
 	},
 
 	_animateZoom: function (e) {