Don't waste space for comment section

Use trick to set 1px width for comment section so it doesn't
reserve space which can be used for document itself.

Thanks to that we don't see grey area on the right side when
zoom level is big enough so document is shown in a full width.

Position correctly HTML elements for comments so they are still visible.

Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
Change-Id: Iccae9c834e05bd1afc5c43424b03d95335923a53

1 files changed, 6 insertions, 6 deletions

diff --git a/loleaflet/src/layer/tile/CommentListSection.ts b/loleaflet/src/layer/tile/CommentListSection.ts
index a23a76d42e..4fdefc6203 100644
--- a/loleaflet/src/layer/tile/CommentListSection.ts
+++ b/loleaflet/src/layer/tile/CommentListSection.ts
@@ -76,7 +76,7 @@ class CommentSection {
 		this.sectionProperties.marginY = 10 * app.dpiScale;
 		this.sectionProperties.offset = 5 * app.dpiScale;
 		this.sectionProperties.layoutTimer = null;
-		this.sectionProperties.width = Math.round(300 * app.dpiScale); // Configurable variable.
+		this.sectionProperties.width = Math.round(1 * app.dpiScale); // Configurable variable.
 		this.sectionProperties.scrollAnnotation = null; // For impress, when 1 or more comments exist.
 	}
 
@@ -211,8 +211,6 @@ class CommentSection {
 			|| this.sectionProperties.docLayer._docType === 'spreadsheet'
 			|| this.sectionProperties.commentList.length === 0)
 			return;
-
-		this.size[0] = 1 * app.dpiScale;
 	}
 
 	public setExpanded() {
@@ -226,8 +224,6 @@ class CommentSection {
 			|| this.sectionProperties.docLayer._docType === 'spreadsheet'
 			|| this.sectionProperties.commentList.length === 0)
 			return;
-
-		this.size[0] = 300 * app.dpiScale;
 	}
 
 	public hideAllComments () {
@@ -1483,8 +1479,12 @@ class CommentSection {
 			var yOrigin = null;
 			var selectedIndex = null;
 			var x = topRight[0];
-			if (this.containerObject.getDocumentAnchorSection().size[0] > app.file.size.pixels[0]) {
+			var commentWidth = 300;
+			var availableSpace = this.containerObject.getDocumentAnchorSection().size[0] - app.file.size.pixels[0];
+			if (availableSpace > commentWidth * 2) {
 				x = topRight[0] - Math.round((this.containerObject.getDocumentAnchorSection().size[0] - app.file.size.pixels[0]) * 0.5);
+			} else if (!this.isCollapsed) {
+				x -= commentWidth;
 			}
 
 			if (this.isCollapsed)