From cfcaccf4e2c11a2fe5e3a1f90d0230c05aa7f0d5 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Thu, 3 Jan 2013 19:18:41 +0000
Subject: more correct version of big typing icon's patch
git-svn-id: http://svn.miranda-ng.org/main/trunk@2936 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
plugins/TabSRMM/src/container.cpp | 2 +-
plugins/TabSRMM/src/generic_msghandlers.cpp | 10 +++++-----
plugins/TabSRMM/src/msgs.cpp | 5 +++--
3 files changed, 9 insertions(+), 8 deletions(-)
(limited to 'plugins/TabSRMM/src')
diff --git a/plugins/TabSRMM/src/container.cpp b/plugins/TabSRMM/src/container.cpp
index 952607d419..176999fad7 100644
--- a/plugins/TabSRMM/src/container.cpp
+++ b/plugins/TabSRMM/src/container.cpp
@@ -1957,7 +1957,7 @@ buttons_done:
* default handling (no win7 taskbar)
*/
if ((HICON)lParam == PluginConfig.g_buttonBarIcons[ICON_DEFAULT_TYPING]) { // always set typing icon, but don't save it...
- SendMessage(hwndDlg, WM_SETICON, ICON_BIG, lParam);
+ SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)PluginConfig.g_IconTypingEventBig);
SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, lParam);
break;
}
diff --git a/plugins/TabSRMM/src/generic_msghandlers.cpp b/plugins/TabSRMM/src/generic_msghandlers.cpp
index 614960613d..53e3374061 100644
--- a/plugins/TabSRMM/src/generic_msghandlers.cpp
+++ b/plugins/TabSRMM/src/generic_msghandlers.cpp
@@ -1653,20 +1653,20 @@ void TSAPI DM_Typing(TWindowData *dat, bool fForceOff)
if (!(dat->pContainer->dwFlags & CNT_NOFLASH) && PluginConfig.m_FlashOnMTN)
ReflashContainer(dat->pContainer);
}
+
if (dat->pContainer->hwndActive != hwndDlg) {
if (dat->mayFlashTab)
dat->iFlashIcon = PluginConfig.g_IconTypingEvent;
HandleIconFeedback(dat, PluginConfig.g_IconTypingEvent);
- } else { // active tab may show icon if status bar is disabled
+ }
+ else { // active tab may show icon if status bar is disabled
if (!hwndStatus) {
- if (TabCtrl_GetItemCount(GetParent(hwndDlg)) > 1 || !(dat->pContainer->dwFlags & CNT_HIDETABS)) {
+ if (TabCtrl_GetItemCount(GetParent(hwndDlg)) > 1 || !(dat->pContainer->dwFlags & CNT_HIDETABS))
HandleIconFeedback(dat, PluginConfig.g_IconTypingEvent);
- }
}
}
if ((GetForegroundWindow() != hwndContainer) || (dat->pContainer->hwndStatus == 0) || (dat->pContainer->hwndActive != hwndDlg))
- SendMessage(hwndContainer, DM_SETICON, (WPARAM)dat, (LPARAM)
- ((PluginConfig.g_IconTypingEventBig != NULL) ? PluginConfig.g_IconTypingEventBig : PluginConfig.g_buttonBarIcons[ICON_DEFAULT_TYPING]));
+ SendMessage(hwndContainer, DM_SETICON, (WPARAM)dat, (LPARAM)PluginConfig.g_buttonBarIcons[ICON_DEFAULT_TYPING]);
dat->showTyping = 1;
}
diff --git a/plugins/TabSRMM/src/msgs.cpp b/plugins/TabSRMM/src/msgs.cpp
index 978d505890..ff26111ceb 100644
--- a/plugins/TabSRMM/src/msgs.cpp
+++ b/plugins/TabSRMM/src/msgs.cpp
@@ -901,7 +901,7 @@ void TSAPI CreateImageList(BOOL bInitial)
if ((HICON)CALLSERVICE_NOTFOUND == PluginConfig.g_IconTypingEventBig)
PluginConfig.g_IconTypingEventBig = 0;
PluginConfig.g_IconSend = PluginConfig.g_buttonBarIcons[9];
- PluginConfig.g_IconTypingEvent = PluginConfig.g_buttonBarIcons[5];
+ PluginConfig.g_IconTypingEvent = PluginConfig.g_buttonBarIcons[ICON_DEFAULT_TYPING];
}
int TABSRMM_FireEvent(HANDLE hContact, HWND hwnd, unsigned int type, unsigned int subType)
@@ -1112,7 +1112,8 @@ static int TSAPI LoadFromIconLib()
PluginConfig.g_buttonBarIconHandles[1] = Skin_GetIconHandle("core_main_8");
PluginConfig.g_buttonBarIconHandles[20] = Skin_GetIconHandle("core_main_9");
- PluginConfig.g_buttonBarIcons[5] = PluginConfig.g_buttonBarIcons[12] = Skin_GetIcon("core_main_23");
+ PluginConfig.g_buttonBarIcons[ICON_DEFAULT_TYPING] =
+ PluginConfig.g_buttonBarIcons[12] = Skin_GetIcon("core_main_23");
PluginConfig.g_IconChecked = Skin_GetIcon("core_main_19");
PluginConfig.g_IconUnchecked = Skin_GetIcon("core_main_20");
PluginConfig.g_IconFolder = Skin_GetIcon("core_main_5");
--
cgit v1.2.3