Commit graph

18 commits

Author SHA1 Message Date
Mike Kaganski
4751ff3e2b Initialize the vectors instead of reserving
The vectors are accessing the elements without pushing to the back.

Signed-off-by: Mike Kaganski <mike.kaganski@collabora.com>
Change-Id: Ia01b54f80b70173b994e776e05710e92248f0e23
2021-07-01 18:18:00 +00:00
Mike Kaganski
1d7e8539bb Hardcode some trigonometry, and move some FP math out from loop
Signed-off-by: Mike Kaganski <mike.kaganski@collabora.com>
Change-Id: I753d1f44e176d4033ead57c6ffdb0f8c8369cfc2
2021-07-01 18:17:25 +00:00
Mike Kaganski
cb917d7eae Bail out of getPixmap gracefully, when rendering failed.
And only insert the new pixmap after the check.

Signed-off-by: Mike Kaganski <mike.kaganski@collabora.com>
Change-Id: I310d321443152967b3aed8992ece3b55287d01cc
2021-06-16 17:42:26 +02:00
Dennis Francis
98c78caa4d fix: watermark not present in fully transparent tiles
Calc has transparent tiles due to client side grid/bg rendering, so do
alpha blending in calc for transparent pixels. As before do alpha
blending for the font rendering phase, no change there.

Signed-off-by: Dennis Francis <dennis.francis@collabora.com>
Change-Id: I30ab21475b6654a9375574be825e01edbdabf82a
(cherry picked from commit 7b7a73c17d4f6213e78f0b8737ce70cbaccbb56d)
2021-06-14 13:33:13 +05:30
mert
c9cc7e840f Save Watermark bitmaps per user for re-use
Although we already save it for 256x256 regular
tiles, we use smaller tiles for preview requests
everytime there is a preview request the pixmap has to
recreated. Used unordered_map instead to keep different
resolutions saved for re-use

Change-Id: I3ced6b08b6e5f8096195b253abba8bb5afdffa3c
Signed-off-by: mert <mert.tumer@collabora.com>
2020-12-28 14:51:02 +03:00
mert
4a1191003f Rotate watermark pixels by 45 degree
Change-Id: I8fac121f94c127518aadd10a6eac4c9f0e496242
Signed-off-by: mert <mert.tumer@collabora.com>
2020-11-17 08:25:15 +03:00
mert
8422d2d596 Fix distortion on watermark text
Change-Id: Id1bda715723e717d6f0893dbc1aef937014076e3
Signed-off-by: mert <mert.tumer@collabora.com>
2020-11-15 13:54:33 +03:00
Ashod Nakashian
3dff047b16 wsd: support line-breaks in watermark text
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>
2020-11-11 08:14:42 +01:00
Ashod Nakashian
4185c5fd03 wsd: encapsulate watermark details
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>
2020-11-11 08:14:42 +01:00
Andras Timar
0002fdfd6c fix license headers
Change-Id: I8623770b32d278a45357dc7f757fabfadd2b4af7
2020-10-01 11:56:43 +02:00
Andras Timar
d6216e4335 default to Carlito in font selector
Change-Id: Ib568253adc48376cf57335934c3471b46d08fdbc
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/103092
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-09-21 16:27:12 +02:00
Tor Lillqvist
4eb598711c Use #pragma once
LibreOffice core uses that, too, and we support an even more
restricted set of compilers.

Change-Id: I0d0e2c8608e323eb5ef0f35ee8c46d02ab49a745
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92467
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-04-18 15:00:18 +02:00
mert
ba42356330 Fix minor comparison error
This patch is a follow-up for overflowing
watermarks patch

Change-Id: I8613736dc4fea49a22ae29aba209c95b1ea93557
Reviewed-on: https://gerrit.libreoffice.org/83635
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
2019-11-27 05:34:27 +01:00
mert
ed2c34296b Fix watermarks overflow the document area
Change-Id: Ia767d0b4f935bc28e0fb0ed0f8c2ddcfb8093734
Reviewed-on: https://gerrit.libreoffice.org/83441
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
2019-11-22 11:15:56 +01:00
mert
2c598ba4ef Rotate Watermarks with 45 degree angle
Change-Id: I9b399a4e1daf52f536d4becae2cc6dc692e16f7a
Reviewed-on: https://gerrit.libreoffice.org/81436
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2019-11-10 23:42:03 +01:00
Miklos Vajna
1e36adb72a kit: also add missing modeline
Change-Id: Ibfc531b65d68928111df213bef08655ef21cea62
2019-10-15 22:18:05 +02:00
Miklos Vajna
fd21e2b34d kit: add missing header/footer
Change-Id: I111aeafb2e2376983e47bb09cc134883ffee64bb
2019-10-15 22:15:41 +02:00
mert
a1c58c04cc Added Watermark.hpp
Change-Id: I3619283031865f59f94157d5b8df14a94ac9327b
2019-10-15 20:25:26 +03:00