Skip to content

cool#15195 document compare: fix bad horizontal position of comments#15234

Merged
caolanm merged 1 commit intomainfrom
private/vmiklos/main
Mar 27, 2026
Merged

cool#15195 document compare: fix bad horizontal position of comments#15234
caolanm merged 1 commit intomainfrom
private/vmiklos/main

Conversation

@vmiklos
Copy link
Copy Markdown
Contributor

@vmiklos vmiklos commented Mar 26, 2026

Open the Writer bugdoc which has a comment, switch to doc compare mode,
the comment is between the "old first" and "new first" pages (which are
next to each other horizontally), while the expectation is that the
comment is on the right of the document content, so should be on the
right of the "new first" page.

It seems ViewLayoutMultiPage already has some code for this and
CommentListSection knows how to use that.

Fix this by making that mechanism more general: also implement a
getTotalSideSpace() in ViewLayoutCompareChanges, then improve
CommentListSection to work with "multi-column layouts" (multi-page view,
doc compare view), at a number of locations where previously it only
considered the multi-page view.

Test that comments are now over the right edge of the "new" pages.

Signed-off-by: Miklos Vajna vmiklos@collabora.com
Change-Id: I746fe21d952b6d4da849878c7c3c31a672f1f1a0

Open the Writer bugdoc which has a comment, switch to doc compare mode,
the comment is between the "old first" and "new first" pages (which are
next to each other horizontally), while the expectation is that the
comment is on the right of the document content, so should be on the
right of the "new first" page.

It seems ViewLayoutMultiPage already has some code for this and
CommentListSection knows how to use that.

Fix this by making that mechanism more general: also implement a
getTotalSideSpace() in ViewLayoutCompareChanges, then improve
CommentListSection to work with "multi-column layouts" (multi-page view,
doc compare view), at a number of locations where previously it only
considered the multi-page view.

Test that comments are now over the right edge of the "new" pages.

Signed-off-by: Miklos Vajna <vmiklos@collabora.com>
Change-Id: I746fe21d952b6d4da849878c7c3c31a672f1f1a0
@vmiklos
Copy link
Copy Markdown
Contributor Author

vmiklos commented Mar 27, 2026

@caolanm could you please review this? Thanks.

Second half of this doc compare vs comments story.

Copy link
Copy Markdown
Contributor

@caolanm caolanm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks ok to me

@github-project-automation github-project-automation Bot moved this from To Review to To Test in Collabora Online Mar 27, 2026
@caolanm caolanm merged commit ce52a2c into main Mar 27, 2026
17 checks passed
@caolanm caolanm deleted the private/vmiklos/main branch March 27, 2026 08:49
@github-project-automation github-project-automation Bot moved this from To Test to Done in Collabora Online Mar 27, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

2 participants