strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

loleaflet: ensure visible element before getting bounds

Browse source 
Change-Id: Iae66d8d52f4d97b61d861586e5a008c18d15e39d
This commit is contained in:
Henry Castro 2017-03-22 22:32:31 -04:00
parent f3700400e6
commit a759a01c7d
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
loleaflet/src/layer/AnnotationManager.js
View file

@ -129,6 +129,7 @@ L.AnnotationManager = L.Class.extend({
if (this._selected.annotation) {
point = L.point(topRight.x, this._map._docLayer._twipsToPixels(this._selected.annotation._data.anchorPos.min).y);
this._selected.annotation.setLatLng(this._map.unproject(point));
this._selected.annotation.show();
bounds = this._selected.annotation.getBounds();
bounds.extend(bounds.min.subtract([0, this.options.marginY]));
bounds.extend(bounds.getBottomLeft().add([0, this.options.marginY]));
@ -143,6 +144,7 @@ L.AnnotationManager = L.Class.extend({
point = L.point(topRight.x, this._map._docLayer._twipsToPixels(annotation._data.anchorPos.min).y);
latlng = this._map.unproject(point);
annotation.setLatLng(latlng);
annotation.show();
bounds = annotation.getBounds();
foundBounds = null;
for (var itBounds in layouts) {
@ -180,7 +182,6 @@ L.AnnotationManager = L.Class.extend({
}
annotation.setLatLng(latlng);
annotation.show();
}
},

2
loleaflet/src/layer/tile/ImpressTileLayer.js
View file

@ -126,9 +126,9 @@ L.ImpressTileLayer = L.TileLayer.extend({
annotation = annotations[index];
if (index >= this._topAnnotation) {
annotation.setLatLng(bounds ? this._map.layerPointToLatLng(bounds.getBottomLeft()) : this._map.layerPointToLatLng(topRight));
annotation.show();
bounds = annotation.getBounds();
bounds.extend(L.point(bounds.max.x, bounds.max.y + this.options.marginY));
annotation.show();
} else {
annotation.hide();
}