commit b44af80f0aa1ce93193f0edb107f17edbabba17a
author Khaled Hosny <khaled@libreoffice.org> Sun Sep 24 18:10:21 2023 +0300
committer Michael Stahl <michael.stahl@allotropia.de> Mon Sep 25 13:33:15 2023 +0200
tree 69d4ac3aba23817064fb861c4f98266a4bc66039
parent d7443d6a3191e37e1e2ad2f2f2d9310e0198b9bf

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>
(cherry picked from commit 841d4634d3c1be48e8106899275f0ef176a377ce)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157211
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>

svx/source/styles/CommonStylePreviewRenderer.cxx

diff --git a/svx/source/styles/CommonStylePreviewRenderer.cxx b/svx/source/styles/CommonStylePreviewRenderer.cxx
index c23861e..d92aac2 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);