summaryrefslogtreecommitdiff
path: root/svx/source/styles
diff options
context:
space:
mode:
authorKhaled Hosny <khaled@libreoffice.org>2023-09-24 18:10:21 +0300
committerخالد حسني <khaled@libreoffice.org>2023-09-24 18:23:47 +0200
commitd9eed9b489d8ad208df307588595f3a8d3b7539b (patch)
treeaebfcc4ff2f5e205c0fb7266e58c398ea57a6888 /svx/source/styles
parent414316a04fe9479dafcb36e3617ee1f5813c6a30 (diff)
tdf#157067: Fix missing background color in style preview
Set the colors after setting the font not before as otherwise they seem to get overridden. Change-Id: I258cb762fd2328369bd8adae63e94ec87c666bb7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157208 Tested-by: Jenkins Reviewed-by: خالد حسني <khaled@libreoffice.org>
Diffstat (limited to 'svx/source/styles')
-rw-r--r--svx/source/styles/CommonStylePreviewRenderer.cxx16
1 files changed, 8 insertions, 8 deletions
diff --git a/svx/source/styles/CommonStylePreviewRenderer.cxx b/svx/source/styles/CommonStylePreviewRenderer.cxx
index c23861e92a72..d92aac21d89c 100644
--- a/svx/source/styles/CommonStylePreviewRenderer.cxx
+++ b/svx/source/styles/CommonStylePreviewRenderer.cxx
@@ -335,12 +335,6 @@ bool CommonStylePreviewRenderer::render(const tools::Rectangle& aRectangle, Rend
mrOutputDev.DrawRect(aRectangle);
}
- if (maFontColor != COL_AUTO)
- mrOutputDev.SetTextColor(maFontColor);
-
- if (maHighlightColor != COL_AUTO)
- mrOutputDev.SetTextFillColor(maHighlightColor);
-
Point aFontDrawPosition = aRectangle.TopLeft();
aFontDrawPosition.AdjustY(mnBaseLine);
if (eRenderAlign == RenderAlign::CENTER)
@@ -376,10 +370,16 @@ bool CommonStylePreviewRenderer::render(const tools::Rectangle& aRectangle, Rend
mrOutputDev.Push(vcl::PushFlags::FONT);
if (oFont)
- {
mrOutputDev.SetFont(*oFont);
+
+ if (maFontColor != COL_AUTO)
+ mrOutputDev.SetTextColor(maFontColor);
+
+ if (maHighlightColor != COL_AUTO)
+ mrOutputDev.SetTextFillColor(maHighlightColor);
+
+ if (oFont)
oFont->QuickDrawText(&mrOutputDev, aFontDrawPosition, rText, nStart, nEnd - nStart, {});
- }
else
mrOutputDev.DrawText(aFontDrawPosition, rText, nStart, nEnd - nStart);