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

CommentSection: Disable doLayout for Calc.

Browse source 
And remove unused variable.

Signed-off-by: Gökay Şatır <gokay.satir@collabora.com>
Change-Id: I979cf084fa8169789d4a32684ccc0c7de046b911
This commit is contained in:
Gökay Şatır 2021-05-29 13:36:47 +03:00 committed by Gökay ŞATIR
parent 5267a4ba25
commit a9472bd06b
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
loleaflet/src/layer/tile/CommentSection.ts
View file

@ -66,7 +66,6 @@ class CommentSection {
this.sectionProperties.commentList = new Array(0); this.sectionProperties.commentList = new Array(0);
this.sectionProperties.selectedComment = null; this.sectionProperties.selectedComment = null;
this.sectionProperties.arrow = null; this.sectionProperties.arrow = null;
this.sectionProperties.hiddenCommentCount = 0;
this.sectionProperties.initialLayoutData = null; this.sectionProperties.initialLayoutData = null;
this.sectionProperties.showResolved = null; this.sectionProperties.showResolved = null;
this.sectionProperties.marginX = 40; this.sectionProperties.marginX = 40;
@ -662,11 +661,9 @@ class CommentSection {
this.unselect(); this.unselect();
} }
annotation.hide(); annotation.hide();
this.sectionProperties.hiddenCommentCount++;
annotation.update(); annotation.update();
} else if (!annotation.isContainerVisible() && annotation.sectionProperties.data.resolved === 'false') { } else if (!annotation.isContainerVisible() && annotation.sectionProperties.data.resolved === 'false') {
annotation.show(); annotation.show();
this.sectionProperties.hiddenCommentCount--;
annotation.update(); annotation.update();
} }
this.layout(); this.layout();
@ -1234,6 +1231,12 @@ class CommentSection {
} }
private doLayout (zoomEnd = false) { private doLayout (zoomEnd = false) {
if (this.sectionProperties.docLayer._docType === 'spreadsheet') {
if (this.sectionProperties.commentList.length > 0)
this.orderCommentList();
return; // No adjustments for Calc, since only one comment can be shown at a time and that comment is shown at its belonging cell.
}
if (this.sectionProperties.commentList.length > 0) { if (this.sectionProperties.commentList.length > 0) {
this.orderCommentList(); this.orderCommentList();
@ -1317,10 +1320,8 @@ class CommentSection {
this.unselect(); this.unselect();
} }
this.sectionProperties.commentList[idx].hide(); this.sectionProperties.commentList[idx].hide();
this.sectionProperties.hiddenCommentCount++;
} else { } else {
this.sectionProperties.commentList[idx].show(); this.sectionProperties.commentList[idx].show();
this.sectionProperties.hiddenCommentCount--;
} }
} }
this.sectionProperties.commentList[idx].update(); this.sectionProperties.commentList[idx].update();
@ -1377,9 +1378,6 @@ class CommentSection {
this.containerObject.addSection(commentSection); this.containerObject.addSection(commentSection);
this.sectionProperties.commentList.push(commentSection); this.sectionProperties.commentList.push(commentSection);
this.updateResolvedState(this.sectionProperties.commentList[i]); this.updateResolvedState(this.sectionProperties.commentList[i]);
if (this.sectionProperties.commentList[i].sectionProperties.data.resolved === 'true') {
this.sectionProperties.hiddenCommentCount++;
}
} }
this.orderCommentList(); this.orderCommentList();