From 22377c8be5548d37deee4258b315c2e5f1b42bca Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 10 Nov 2012 20:18:48 +0000 Subject: - fixed crazy drawing bug in nicer; - code cleaning git-svn-id: http://svn.miranda-ng.org/main/trunk@2281 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Clist_nicer/src/clcpaint.cpp | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) (limited to 'plugins') diff --git a/plugins/Clist_nicer/src/clcpaint.cpp b/plugins/Clist_nicer/src/clcpaint.cpp index 5c92e82748..7801c0237d 100644 --- a/plugins/Clist_nicer/src/clcpaint.cpp +++ b/plugins/Clist_nicer/src/clcpaint.cpp @@ -955,22 +955,20 @@ bgskipped: } else iconXSpace = 0; - if (type == CLCIT_CONTACT && !dat->bisEmbedded) { + if (type == CLCIT_CONTACT) { contact->extraIconRightBegin = 0; - if (cEntry && (contact->extraCacheEntry >= 0 && contact->extraCacheEntry < cfg::nextCacheEntry)) { - for (int i = dat->extraColumnsCount-1; i >= 0; i--) { - if (contact->iExtraImage[i] == EMPTY_EXTRA_ICON) - continue; - - if (contact->extraIconRightBegin == 0) - contact->extraIconRightBegin = rcContent.right; - - rightIcons++; - ImageList_DrawEx(dat->himlExtraColumns, contact->iExtraImage[i], hdcMem, - rcContent.right - dat->extraColumnSpacing * rightIcons, - y + (rowHeight - g_cysmIcon)/2, - 0, 0, CLR_NONE, CLR_NONE, ILD_NORMAL); - } + for (int i = dat->extraColumnsCount-1; i >= 0; i--) { + if (contact->iExtraImage[i] == EMPTY_EXTRA_ICON) + continue; + + if (contact->extraIconRightBegin == 0) + contact->extraIconRightBegin = rcContent.right; + + rightIcons++; + ImageList_DrawEx(dat->himlExtraColumns, contact->iExtraImage[i], hdcMem, + rcContent.right - dat->extraColumnSpacing * rightIcons, + y + (rowHeight - g_cysmIcon)/2, + 0, 0, CLR_NONE, CLR_NONE, ILD_NORMAL); } } } -- cgit v1.2.3