diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-04-11 08:04:17 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-04-11 08:04:17 +0000 |
| commit | ba430f779e1f3692d563c48b3517915429bd393d (patch) | |
| tree | 9af1ee5dcb725e8b66c796b2c76795b4a00481d9 /plugins/TabSRMM/src/controls.cpp | |
| parent | 5fe330d9ca85adf0df19f60839f5472d53e34f9c (diff) | |
status icons almost recovered
git-svn-id: http://svn.miranda-ng.org/main/trunk@4420 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/TabSRMM/src/controls.cpp')
| -rw-r--r-- | plugins/TabSRMM/src/controls.cpp | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/plugins/TabSRMM/src/controls.cpp b/plugins/TabSRMM/src/controls.cpp index 5477979d29..6f0d9141a1 100644 --- a/plugins/TabSRMM/src/controls.cpp +++ b/plugins/TabSRMM/src/controls.cpp @@ -925,10 +925,9 @@ LONG_PTR CALLBACK StatusBarSubclassProc(HWND hWnd, UINT msg, WPARAM wParam, LPAR {
int list_icons = 0;
struct TWindowData *dat = (struct TWindowData *)lParam;
- if (dat) {
- while ( CallService(MS_MSG_GETNTHICON, (WPARAM)dat->hContact, list_icons))
+ if (dat)
+ while ( Srmm_GetNthIcon(dat->hContact, list_icons))
list_icons++;
- }
SendMessage(hWnd, WM_SIZE, 0, 0);
@@ -1012,11 +1011,11 @@ LONG_PTR CALLBACK StatusBarSubclassProc(HWND hWnd, UINT msg, WPARAM wParam, LPAR int gap = 2;
unsigned int iconNum = (pt.x - rc.left) / (PluginConfig.m_smcxicon + gap);
+ char *szModule = NULL, *szTooltip;
int list_icons = 0;
- StatusIconData *si, *clicked = NULL;
- while ((si = (StatusIconData*)CallService(MS_MSG_GETNTHICON, (WPARAM)dat->hContact, list_icons)) != NULL)
+ while (StatusIconData *sid = Srmm_GetNthIcon(dat->hContact, list_icons))
if (list_icons++ == iconNum)
- clicked = si;
+ szModule = sid->szModule, szTooltip = sid->szTooltip;
if ((int)iconNum == list_icons && pContainer) {
TCHAR wBuf[512];
@@ -1043,11 +1042,9 @@ LONG_PTR CALLBACK StatusBarSubclassProc(HWND hWnd, UINT msg, WPARAM wParam, LPAR CallService(szTTService, (WPARAM)wBuf, (LPARAM)&ti);
tooltip_active = TRUE;
}
- else {
- if (clicked) {
- CallService("mToolTip/ShowTip", (WPARAM)clicked->szTooltip, (LPARAM)&ti);
- tooltip_active = TRUE;
- }
+ else if (szModule) {
+ CallService("mToolTip/ShowTip", (WPARAM)szTooltip, (LPARAM)&ti);
+ tooltip_active = TRUE;
}
}
SendMessage(hWnd, SB_GETRECT, 1, (LPARAM)&rc);
|