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

Dennis Francis (via logerrit) logerrit at kemper.freedesktop.org
Mon Jul 6 17:00:09 UTC 2020


 loleaflet/src/control/Control.ColumnHeader.js |    8 --------
 1 file changed, 8 deletions(-)

New commits:
commit e6421d253b0a37a062797b7d8f8ca4d210698705
Author:     Dennis Francis <dennis.francis at collabora.com>
AuthorDate: Fri Jun 5 20:45:34 2020 +0530
Commit:     Dennis Francis <dennis.francis at collabora.com>
CommitDate: Mon Jul 6 18:59:50 2020 +0200

    disable scaling of column-header with zoom...
    
    until we have a better solution. It messes up the positioning of headers
    w.r.t the map at certain zooms.
    
    Change-Id: I32422a5f5076f83631f28a90db6a543e830ccf0e
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98150
    Tested-by: Jenkins
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Dennis Francis <dennis.francis at collabora.com>

diff --git a/loleaflet/src/control/Control.ColumnHeader.js b/loleaflet/src/control/Control.ColumnHeader.js
index 254a4df41..80559a20d 100644
--- a/loleaflet/src/control/Control.ColumnHeader.js
+++ b/loleaflet/src/control/Control.ColumnHeader.js
@@ -398,14 +398,6 @@ L.Control.ColumnHeader = L.Control.Header.extend({
 		this._setCanvasWidth();
 		this._setCanvasHeight();
 		this._canvasContext.clearRect(0, 0, canvas.width, canvas.height);
-		if (this._map._permission === 'edit') {
-			// Adjust (column) _headerHeight according to zoomlevel. This is used below to call resize()
-			// where column/corner header are resized. Besides the document container and row header container
-			// are moved up or down as required so that there is no gap/overlap below column header.
-			// Limit zoomScale so that the column header is not too small (unreadable) or too big.
-			this._headerHeight = Math.ceil(this._canvasBaseHeight *
-				this.getHeaderZoomScale(/* lowerBound */ 0.74, /* upperBound */ 1.15));
-		}
 
 		// Reset state
 		this._current = -1;


More information about the Libreoffice-commits mailing list