diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-11-09 16:28:38 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-11-09 16:28:38 +0000 |
| commit | f24df8d7c43d0bd1e4f8036a1f9d886ccdc3680c (patch) | |
| tree | 5c64d24932839487d9e836491f9ca32ab7bd2ddc /plugins/Clist_nicer/src/clcpaint.cpp | |
| parent | ddd6c8f83ee10e7312458985c4ff624e68abf75b (diff) | |
part II:
- extra icons masks killed from the nicer+ cache;
- some minor glitches in options
git-svn-id: http://svn.miranda-ng.org/main/trunk@2261 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Clist_nicer/src/clcpaint.cpp')
| -rw-r--r-- | plugins/Clist_nicer/src/clcpaint.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/plugins/Clist_nicer/src/clcpaint.cpp b/plugins/Clist_nicer/src/clcpaint.cpp index 15edd69be8..9ddd2f3f05 100644 --- a/plugins/Clist_nicer/src/clcpaint.cpp +++ b/plugins/Clist_nicer/src/clcpaint.cpp @@ -971,12 +971,8 @@ bgskipped: BYTE bApparentModeDontCare = !((flags & CONTACTF_VISTO) ^ (flags & CONTACTF_INVISTO));
contact->extraIconRightBegin = 0;
if (cEntry && (contact->extraCacheEntry >= 0 && contact->extraCacheEntry < cfg::nextCacheEntry)) {
- DWORD dwOldMask = cEntry->dwXMask;
-//!!!!!! if (dwFlags & CLUI_FRAME_USEXSTATUSASSTATUS)
-//!!!!!! cEntry->dwXMask &= ~EIMG_SHOW_ADV1;
-
for (int i = EXTRA_ICON_COUNT - 1; i >= 0; i--) {
- if (contact->iExtraImage[i] != 0xffff && ((1 << i) & cEntry->dwXMask)) {
+ if (contact->iExtraImage[i] != EMPTY_EXTRA_ICON) {
if (contact->extraIconRightBegin == 0 && i != (EXTRA_ICON_COUNT - 1))
contact->extraIconRightBegin = rcContent.right;
ImageList_DrawEx(dat->himlExtraColumns, contact->iExtraImage[i], hdcMem, rcContent.right - cfg::dat.exIconScale, twoRows ? rcContent.bottom - g_exIconSpacing : y + ((rowHeight - cfg::dat.exIconScale) >> 1),
@@ -985,7 +981,6 @@ bgskipped: rightIcons++;
}
}
- cEntry->dwXMask = dwOldMask;
}
if (!bApparentModeDontCare && (dwFlags & CLUI_SHOWVISI) && contact->proto) {
BOOL fVisi;
@@ -1093,7 +1088,7 @@ text: if (!g_center) {
rc.top = y + ((rowHeight) >> 1); rc.bottom = rc.top + 2;
rc.left = rightLineStart;
- rc.right = clRect->right - 1 - dat->extraColumnSpacing * dat->extraColumnsCount - dat->rightMargin;
+ rc.right = clRect->right - 1 - dat->rightMargin;
if (rc.right - rc.left > 1)
DrawEdge(hdcMem, &rc, BDR_SUNKENOUTER, BF_RECT);
}
|