From 76e7322839a1145eace5fdc90a37cbb7e2de3b04 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Fri, 17 Jan 2014 22:06:40 +0000
Subject: - colored nicks in tabSRMM; - color registration removed from core
 due to some conflicts

git-svn-id: http://svn.miranda-ng.org/main/trunk@7701 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/TabSRMM/src/chat/window.cpp | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

(limited to 'plugins/TabSRMM')

diff --git a/plugins/TabSRMM/src/chat/window.cpp b/plugins/TabSRMM/src/chat/window.cpp
index 0f36e33eed..5a5e192ef6 100644
--- a/plugins/TabSRMM/src/chat/window.cpp
+++ b/plugins/TabSRMM/src/chat/window.cpp
@@ -45,6 +45,7 @@ extern HMENU g_hMenu;
 
 static HKL hkl = NULL;
 static HCURSOR hCurHyperlinkHand;
+static char szIndicators[] = { '+', '%', '@', '!', 0, '*' };
 
 struct MESSAGESUBDATA
 {
@@ -2252,7 +2253,6 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 			if (dis->CtlID == IDC_LIST) {
 				int x_offset = 0;
 				int index = dis->itemID;
-				char szIndicator = 0;
 
 				USERINFO *ui = pci->UM_FindUserFromIndex(si->pUsers, index);
 				if (ui == NULL)
@@ -2268,21 +2268,24 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 				HFONT hOldFont = (HFONT) SelectObject(dis->hDC, hFont);
 				SetBkMode(dis->hDC, TRANSPARENT);
 
+				int nickIndex = -1;
+				for (int i = 0; i < 6; i++) {
+					if (hIcon == pci->hIcons[ICON_STATUS1 + i]) {
+						nickIndex = i;
+						break;
+					}
+				}
+
 				if (dis->itemState & ODS_SELECTED) {
 					FillRect(dis->hDC, &dis->rcItem, g_Settings.SelectionBGBrush);
 					SetTextColor(dis->hDC, g_Settings.nickColors[6]);
 				}
 				else {
 					FillRect(dis->hDC, &dis->rcItem, pci->hListBkgBrush);
-					if (g_Settings.bColorizeNicks && szIndicator != 0) {
-						for (int i = 0; i < 6; i++) {
-							if (hIcon == pci->hIcons[ICON_STATUS0 + i]) {
-								SetTextColor(dis->hDC, g_Settings.nickColors[i]);
-								break;
-							}
-						}
-					}
-					else SetTextColor(dis->hDC, g_Settings.UserListColors[ui->iStatusEx]);
+					if (g_Settings.bColorizeNicks && nickIndex != -1)
+						SetTextColor(dis->hDC, g_Settings.nickColors[nickIndex]);
+					else
+						SetTextColor(dis->hDC, g_Settings.UserListColors[ui->iStatusEx]);
 				}
 				x_offset = 2;
 
@@ -2296,7 +2299,7 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 				if (g_Settings.bClassicIndicators) {
 					char szTemp[3];
 					szTemp[1] = 0;
-					szTemp[0] = szIndicator;
+					szTemp[0] = szIndicators[nickIndex];
 					if (szTemp[0]) {
 						SIZE szUmode;
 						GetTextExtentPoint32A(dis->hDC, szTemp, 1, &szUmode);
-- 
cgit v1.2.3