diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-01-18 09:34:05 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-01-18 09:34:05 +0000 |
| commit | 04ac06b7119933997ee0b407478d4cb409007098 (patch) | |
| tree | 7fd4cdc723f4d38a2bc42230062bddb1445ac5f0 /plugins/TabSRMM/src/chat/window.cpp | |
| parent | 69ee782255e915d282f17cf702eff574fb82e84a (diff) | |
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
Diffstat (limited to 'plugins/TabSRMM/src/chat/window.cpp')
| -rw-r--r-- | plugins/TabSRMM/src/chat/window.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
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]);
}
|