wsd: support line-breaks in watermark text #565
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Ashod
force-pushed
the
private/ash/watermark
branch
from
fbb4801
to
0a49e52
Compare
timar
reviewed
Nov 9, 2020
kendy
requested changes
Nov 10, 2020
There was a problem hiding this comment.
Would be really good to change the LOG_ERR to a less scary loglevel as Andras pointed out.
Also in general, would be great to split functional changes and non-functional ones (like the const correctness) to separate patches - now when we have a review tool that allows to push several patches as part of one PR :-) - but please don't change it for this one, only the LOG_ERR is blocking at the moment.
Change-Id: Ie75ae1cc73791af2e8f52b7ccab438b7adbd795e Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
The watermark handler member has been fully encapsulated inside ChildSession, so there is no need to have public members or circular dependencies (ChildSession owns Watermark instance, and Watermark takes ChildSession instance to construct and initialize). Minor refactoring and const-correctness improvements. This is a non-functional patch. Change-Id: I32525c47e35e96fc5314e107639be93ebc49a60e Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
New-line breaks can now be inserted in the watermark text using . This helps break long watermark texts at desired points and therefore make watermarks more readable. Change-Id: Ifee6faa06c9fb1fac38e5a4036c2e225829d796d Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
Ashod
force-pushed
the
private/ash/watermark
branch
from
0a49e52
to
0fcd6a4
Compare
kendy
approved these changes
Nov 11, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
New-line breaks can now be inserted in the watermark
text using \n.
The watermark handler member has been fully encapsulated
inside ChildSession, so there is no need to have public
members or circular dependencies (ChildSession owns Watermark
instance, and Watermark takes ChildSession instance to
construct and initialize).
Minor refactoring and const-correctness improvements.
Change-Id: I66188c2619dd7c95b872c87c5144810b06554442