commit caa1d1ccf39ff8a60b7d89dd53afbf73d3cafeca
author Caolán McNamara <caolanm@redhat.com> Thu Mar 02 16:51:41 2023 +0000
committer Caolán McNamara <caolanm@redhat.com> Thu Mar 02 20:01:01 2023 +0000
tree c7042d0d13cfba410da4871ee0d56c01a12f47e5
parent 846302d212ec2a88b7d83d7cde4e2dd0cf930fbb

Resolves: tdf#153787 highlighted entry text overdraws selected entry text

Change-Id: Iabf1d4a672aa508c5143f12169678278186ddd47
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148139
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

svtools/source/control/valueset.cxx

diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx
index 96f9405..0da10bf 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -1515,6 +1515,9 @@ void ValueSet::ImplDrawItemText(vcl::RenderContext& rRenderContext, const OUStri
        nTxtOffset += NAME_LINE_HEIGHT+NAME_LINE_OFF_Y;

    rRenderContext.SetTextColor(Application::GetSettings().GetStyleSettings().GetButtonTextColor());
    // tdf#153787 highlighted entry text is drawn in the same Paint as the selected text, so can
    // overwrite already rendered text
    rRenderContext.Erase(tools::Rectangle(Point(0, nTxtOffset), Point(aWinSize.Width(), aWinSize.Height())));
    rRenderContext.DrawText(Point((aWinSize.Width() - nTxtWidth) / 2, nTxtOffset + (NAME_OFFSET / 2)), rText);

    rRenderContext.Pop();