commit b39364492c7cbe34923e0d0755db8737b7d6225a
author Caolán McNamara <caolanm@redhat.com> Wed Aug 19 17:06:26 2020 +0100
committer Caolán McNamara <caolanm@redhat.com> Thu Aug 20 10:09:15 2020 +0200
tree a725ba76d91d1a9acde981fc405522c3ac24065b
parent bcf8868e031f916473f13bcd1a0835c74cb05de5

use HighlightTextColor from Settings for thumbnailviewitem HighlightTextColor

so if an icon is selected, typically with a blue background, that
the text is rendered with a matching color, typically white foreground

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

sfx2/source/control/thumbnailview.cxx

diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx
index b37cb61..f0eae30 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -137,7 +137,7 @@ void ThumbnailView::ImplInit()
    maFillColor = GetSettings().GetStyleSettings().GetFieldColor();
    maTextColor = GetSettings().GetStyleSettings().GetWindowTextColor();
    maHighlightColor = GetSettings().GetStyleSettings().GetHighlightColor();
    maHighlightTextColor = GetSettings().GetStyleSettings().GetWindowTextColor();
    maHighlightTextColor = GetSettings().GetStyleSettings().GetHighlightTextColor();
    maSelectHighlightColor = GetSettings().GetStyleSettings().GetActiveColor();
    maSelectHighlightTextColor = GetSettings().GetStyleSettings().GetActiveTextColor();

@@ -1321,7 +1321,7 @@ void SfxThumbnailView::ImplInit()
    maFillColor = rSettings.GetFieldColor();
    maTextColor = rSettings.GetWindowTextColor();
    maHighlightColor = rSettings.GetHighlightColor();
    maHighlightTextColor = rSettings.GetWindowTextColor();
    maHighlightTextColor = rSettings.GetHighlightTextColor();
    maSelectHighlightColor = rSettings.GetActiveColor();
    maSelectHighlightTextColor = rSettings.GetActiveTextColor();

sfx2/source/control/thumbnailviewitem.cxx

diff --git a/sfx2/source/control/thumbnailviewitem.cxx b/sfx2/source/control/thumbnailviewitem.cxx
index 40a68ec..b3be4b5 100644
--- a/sfx2/source/control/thumbnailviewitem.cxx
+++ b/sfx2/source/control/thumbnailviewitem.cxx
@@ -249,10 +249,13 @@ void ThumbnailViewItem::addTextPrimitives (const OUString& rText, const Thumbnai

        // setup color
        BColor aTextColor = pAttrs->aTextColor;
        if( mbSelected && mbHover)
            aTextColor = pAttrs->aSelectHighlightTextColor;
        else if (mbSelected || mbHover)
            aTextColor = pAttrs->aHighlightTextColor;
        if(mbSelected)
        {
            if (mbHover)
                aTextColor = pAttrs->aSelectHighlightTextColor;
            else
                aTextColor = pAttrs->aHighlightTextColor;
        }

        rSeq[nPrimitives++] = drawinglayer::primitive2d::Primitive2DReference(
                    new TextSimplePortionPrimitive2D(aTextMatrix,