summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-11-23 15:14:41 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-11-26 15:44:49 +0100
commitacfa3917ab2eb3d3efd45f319ec48e6ccb87c5dd (patch)
treea2d0efb4e9adbd52474918275fe173568acb6ab5 /svtools
parent4a59a8aba8c9d451edff790d9281d0095c1bd78e (diff)
remove unused enum value SvTLEntryFlags::IN_USE
Change-Id: Ieb09d4d28cc2084da4660165a96561ee57d2420d Reviewed-on: https://gerrit.libreoffice.org/64029 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svtools')
-rw-r--r--svtools/source/contnr/iconview.cxx28
1 files changed, 12 insertions, 16 deletions
diff --git a/svtools/source/contnr/iconview.cxx b/svtools/source/contnr/iconview.cxx
index f00e10b77b5e..31f80325f40d 100644
--- a/svtools/source/contnr/iconview.cxx
+++ b/svtools/source/contnr/iconview.cxx
@@ -101,7 +101,6 @@ void IconView::PaintEntry(SvTreeListEntry& rEntry, long nX, long nY,
Color aBackupColor = rRenderContext.GetFillColor();
bool bCurFontIsSel = false;
- bool bInUse = rEntry.HasInUseEmphasis();
const WinBits nWindowStyle = GetStyle();
const bool bHideSelection = (nWindowStyle & WB_HIDESELECTION) !=0 && !HasFocus();
const StyleSettings& rSettings = rRenderContext.GetSettings().GetStyleSettings();
@@ -142,22 +141,19 @@ void IconView::PaintEntry(SvTreeListEntry& rEntry, long nX, long nY,
if (pViewDataEntry->IsHighlighted())
{
Color aNewWallColor = rSettings.GetHighlightColor();
- if (!bInUse)
+ // if the face color is bright then the deactive color is also bright
+ // -> so you can't see any deactive selection
+ if (bHideSelection && !rSettings.GetFaceColor().IsBright()
+ && aWallpaper.GetColor().IsBright() != rSettings.GetDeactiveColor().IsBright())
{
- // if the face color is bright then the deactive color is also bright
- // -> so you can't see any deactive selection
- if (bHideSelection && !rSettings.GetFaceColor().IsBright()
- && aWallpaper.GetColor().IsBright() != rSettings.GetDeactiveColor().IsBright())
- {
- aNewWallColor = rSettings.GetDeactiveColor();
- }
- // set font color to highlight
- if (!bCurFontIsSel)
- {
- rRenderContext.SetTextColor(aHighlightTextColor);
- rRenderContext.SetFont(aHighlightFont);
- bCurFontIsSel = true;
- }
+ aNewWallColor = rSettings.GetDeactiveColor();
+ }
+ // set font color to highlight
+ if (!bCurFontIsSel)
+ {
+ rRenderContext.SetTextColor(aHighlightTextColor);
+ rRenderContext.SetFont(aHighlightFont);
+ bCurFontIsSel = true;
}
aWallpaper.SetColor(aNewWallColor);
}