summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2023-03-02 16:51:41 +0000
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2023-03-09 12:34:58 +0000
commit73e307eb0c7811b84b6fb72f3241ea91a0b760ff (patch)
tree4c9a0a0a36ef5c6ed9709baf7ccdbe4247334bff
parentEnable building non-Mac App Store Universal .dmg from merged and signed .app (diff)
downloadcore-73e307eb0c7811b84b6fb72f3241ea91a0b760ff.tar.gz
core-73e307eb0c7811b84b6fb72f3241ea91a0b760ff.zip
Resolves: tdf#153787 highlighted entry text overdraws selected entry text
Change-Id: Iabf1d4a672aa508c5143f12169678278186ddd47 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148099 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
-rw-r--r--svtools/source/control/valueset.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx
index 96f940555965..0da10bfda9e2 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();