summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolan.mcnamara@collabora.com>2023-06-07 19:50:50 +0100
committerMiklos Vajna <vmiklos@collabora.com>2023-06-09 11:22:25 +0200
commitcb4f72a94ed661ed6b0d2ca7259158d6d8ed9fd1 (patch)
tree3583c2ad85374769d2d3118ca21ff61e5efff308 /vcl
parent770df258bc0a66ee7551a59807d79cebcdcbb85e (diff)
Related: CollaboraOnline#6511 cairo backend can do transparent text
and avoid the extra work required here for the generic case Change-Id: Ic01b8b69f2d59e585605ce1e981298fda9185824 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152784 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/headless/SvpGraphicsBackend.cxx1
-rw-r--r--vcl/unx/generic/gdi/cairotextrender.cxx5
2 files changed, 4 insertions, 2 deletions
diff --git a/vcl/headless/SvpGraphicsBackend.cxx b/vcl/headless/SvpGraphicsBackend.cxx
index 2a0055c08029..f979cacd5b49 100644
--- a/vcl/headless/SvpGraphicsBackend.cxx
+++ b/vcl/headless/SvpGraphicsBackend.cxx
@@ -1000,6 +1000,7 @@ bool SvpGraphicsBackend::supportsOperation(OutDevSupportType eType) const
{
case OutDevSupportType::TransparentRect:
case OutDevSupportType::B2DDraw:
+ case OutDevSupportType::TransparentText:
return true;
}
return false;
diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx
index 0a10f6708faf..9662c3e4bd11 100644
--- a/vcl/unx/generic/gdi/cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/cairotextrender.cxx
@@ -334,10 +334,11 @@ void CairoTextRender::DrawTextLayout(const GenericSalLayout& rLayout, const SalG
clipRegion(cr);
- cairo_set_source_rgb(cr,
+ cairo_set_source_rgba(cr,
mnTextColor.GetRed()/255.0,
mnTextColor.GetGreen()/255.0,
- mnTextColor.GetBlue()/255.0);
+ mnTextColor.GetBlue()/255.0,
+ mnTextColor.GetAlpha()/255.0);
FT_Face aFace = rFont.GetFtFace();
CairoFontsCache::CacheId aId;