From aed5f79e3625bf7f380c92b0f38f1f090b9f484f Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 7 Nov 2012 19:10:54 +0000 Subject: fix for CLS_EX_NOTRANSLUCENTSEL option in Clist Classic git-svn-id: http://svn.miranda-ng.org/main/trunk@2237 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/core/stdclist/src/clcpaint.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/core') diff --git a/src/core/stdclist/src/clcpaint.cpp b/src/core/stdclist/src/clcpaint.cpp index 9e910d8c9c..6684e8f5c6 100644 --- a/src/core/stdclist/src/clcpaint.cpp +++ b/src/core/stdclist/src/clcpaint.cpp @@ -492,20 +492,19 @@ void PaintClc(HWND hwnd, struct ClcData *dat, HDC hdc, RECT * rcPaint) int rightOffset = 0; for (int i = dat->extraColumnsCount-1; i >= 0; i--) { COLORREF colourFg = dat->selBkColour; - int mode = ILD_NORMAL; if (group->cl.items[group->scanIndex]->iExtraImage[i] == EMPTY_EXTRA_ICON) continue; + int mode = ILD_NORMAL; if (selected) mode = ILD_SELECTED; else if (hottrack) { - mode = ILD_FOCUS; colourFg = dat->hotTextColour; + mode = dat->exStyle & CLS_EX_NOTRANSLUCENTSEL ? ILD_NORMAL : ILD_BLEND50; } - else if (group->cl.items[group->scanIndex]->type == CLCIT_CONTACT && group->cl.items[group->scanIndex]->flags & CONTACTF_NOTONLIST) { + else if (group->cl.items[group->scanIndex]->type == CLCIT_CONTACT && group->cl.items[group->scanIndex]->flags & CONTACTF_NOTONLIST) colourFg = dat->fontInfo[FONTID_NOTONLIST].colour; - mode = ILD_BLEND50; - } + rightOffset += dat->extraColumnSpacing; ImageList_DrawEx(dat->himlExtraColumns, group->cl.items[group->scanIndex]->iExtraImage[i], hdcMem, clRect.right - rightOffset, y + ((dat->rowHeight - 16) >> 1), 0, 0, -- cgit v1.2.3