[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/src

[Pranam Lashkari (via logerrit)]

 loleaflet/src/layer/tile/ImpressTileLayer.js |    2 +-
 loleaflet/src/map/Map.js                     |   10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 833ad93687c8a3d7a2a1dcdc9938ec9f5b43ff7f
Author:     Pranam Lashkari <lpranam at collabora.com>
AuthorDate: Tue Sep 8 06:30:46 2020 +0530
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Sep 9 14:18:57 2020 +0200

    leaflet: fixed annotation getting out of screen
    
    problem:
    annotations in impress were overlapped by controls sometimes
    which makes kabab menu inaccessible
    on the reloading or opening doc if annotation,
    half annotation is out of the screen on right
    
    Change-Id: I830df8a393dae93db571fb999cb649bc87126d4a
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102213
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loleaflet/src/layer/tile/ImpressTileLayer.js b/loleaflet/src/layer/tile/ImpressTileLayer.js
index 577c078dc..9f9a3389f 100644
--- a/loleaflet/src/layer/tile/ImpressTileLayer.js
+++ b/loleaflet/src/layer/tile/ImpressTileLayer.js
@@ -312,7 +312,7 @@ L.ImpressTileLayer = L.TileLayer.extend({
 		var topAnnotation;
 		var annotations = this._annotations[this._partHashes[this._selectedPart]];
 		var topRight = this._map.latLngToLayerPoint(this._map.options.docBounds.getNorthEast())
-			.add(L.point((this._selectedAnnotation ? 3 : 2) * this.options.marginX, this.options.marginY));
+			.add(L.point(5, this.options.marginY));
 		var bounds, annotation;
 		for (var index in annotations) {
 			annotation = annotations[index];
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 1d941f5de..1a0e1e988 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -1105,6 +1105,16 @@ L.Map = L.Evented.extend({
 		}
 
 		this.fire('moveend', {hard: !preserveMapOffset});
+
+		if (this.getDocType() === 'presentation') {
+			if (this._docLayer._selectedParts !== undefined) {
+				var parHash = this._docLayer._partHashes[this._docLayer._selectedPart];
+				var annotations = this._docLayer._annotations[parHash];
+				for (var i in annotations) {
+					annotations[i].update();
+				}
+			}
+		}
 	},
 
 	_rawPanBy: function (offset) {