From 0a668c8eb335ba601d97fc7c8dbbecb1c7455408 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sun, 4 Nov 2012 22:36:16 +0000
Subject: massive extinction of clutches: - nicer own extra icons; - duplicate
 cache entries in modern - many other quirks

git-svn-id: http://svn.miranda-ng.org/main/trunk@2201 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/modules/clist/clcmsgs.cpp | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

(limited to 'src/modules/clist/clcmsgs.cpp')

diff --git a/src/modules/clist/clcmsgs.cpp b/src/modules/clist/clcmsgs.cpp
index 3c209fb62a..7d5664ec20 100644
--- a/src/modules/clist/clcmsgs.cpp
+++ b/src/modules/clist/clcmsgs.cpp
@@ -151,16 +151,23 @@ LRESULT fnProcessExternalMessages(HWND hwnd, struct ClcData *dat, UINT msg, WPAR
 		return contact->group->expanded;
 	}
 
+	case CLM_SETEXTRASPACE:
+		dat->extraColumnSpacing = (int)wParam;
+		cli.pfnInvalidateRect(hwnd,NULL,FALSE);
+		return 0;
+
 	case CLM_GETEXTRACOLUMNS:
 		return dat->extraColumnsCount;
 
 	case CLM_GETEXTRAIMAGE:
 	{
-		ClcContact *contact;
 		if (LOWORD(lParam) >= dat->extraColumnsCount)
-			return 0xFF;
+			return 0xFFFF;
+
+		ClcContact *contact;
 		if ( !cli.pfnFindItem(hwnd, dat, (HANDLE) wParam, &contact, NULL, NULL))
-			return 0xFF;
+			return 0xFFFF;
+
 		return contact->iExtraImage[LOWORD(lParam)];
 	}
 
@@ -361,7 +368,7 @@ LRESULT fnProcessExternalMessages(HWND hwnd, struct ClcData *dat, UINT msg, WPAR
 	}
 
 	case CLM_SETEXTRACOLUMNS:
-		if (wParam > MAXEXTRACOLUMNS)
+		if (wParam > EXTRA_ICON_COUNT)
 			return 0;
 		dat->extraColumnsCount = wParam;
 		cli.pfnInvalidateRect(hwnd, NULL, FALSE);
@@ -369,12 +376,14 @@ LRESULT fnProcessExternalMessages(HWND hwnd, struct ClcData *dat, UINT msg, WPAR
 
 	case CLM_SETEXTRAIMAGE:
 	{
-		ClcContact *contact;
 		if (LOWORD(lParam) >= dat->extraColumnsCount)
 			return 0;
+
+		ClcContact *contact;
 		if ( !cli.pfnFindItem(hwnd, dat, (HANDLE) wParam, &contact, NULL, NULL))
 			return 0;
-		contact->iExtraImage[LOWORD(lParam)] = (BYTE) HIWORD(lParam);
+
+		contact->iExtraImage[LOWORD(lParam)] = HIWORD(lParam);
 		cli.pfnInvalidateRect(hwnd, NULL, FALSE);
 		break;
 	}
-- 
cgit v1.2.3