From 04ac06b7119933997ee0b407478d4cb409007098 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 18 Jan 2014 09:34:05 +0000 Subject: end of crazy matrix mechanics in chat's icon ordering git-svn-id: http://svn.miranda-ng.org/main/trunk@7708 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/TabSRMM/src/chat/window.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'plugins/TabSRMM/src/chat/window.cpp') diff --git a/plugins/TabSRMM/src/chat/window.cpp b/plugins/TabSRMM/src/chat/window.cpp index df7b271eb8..ea559adc64 100644 --- a/plugins/TabSRMM/src/chat/window.cpp +++ b/plugins/TabSRMM/src/chat/window.cpp @@ -45,8 +45,7 @@ extern HMENU g_hMenu; static HKL hkl = NULL; static HCURSOR hCurHyperlinkHand; -static char szIndicators[] = { '+', '%', '@', '!', 0, '*' }; -static int nickOrders[] = { 2, 1, 0, 3, 5, 4 }; +char szIndicators[] = { '@', '%', '+', '!', '*', 0 }; struct MESSAGESUBDATA { @@ -2271,8 +2270,8 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar int nickIndex = -1; for (int i = 0; i < STATUSICONCOUNT; i++) { - if (hIcon == pci->hIcons[ICON_STATUS1 + i]) { - nickIndex = nickOrders[i]; + if (hIcon == pci->hIcons[ICON_STATUS0 + i]) { + nickIndex = i; break; } } @@ -2284,7 +2283,7 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar else { FillRect(dis->hDC, &dis->rcItem, pci->hListBkgBrush); if (g_Settings.bColorizeNicks && nickIndex != -1) - SetTextColor(dis->hDC, g_Settings.nickColors[nickIndex]); + SetTextColor(dis->hDC, g_Settings.nickColors[si->iStatusCount - nickIndex - 1]); else SetTextColor(dis->hDC, g_Settings.UserListColors[ui->iStatusEx]); } -- cgit v1.2.3