diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-12-28 21:48:19 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-12-28 21:48:19 +0000 |
| commit | 7636121591882dafe8f181aa857ae7041f9cc364 (patch) | |
| tree | a824c49838c71ae1cd1f121f2137019ec8de619b /plugins/TabSRMM | |
| parent | 79b8ebded1a82dd8480bfb4d9cbe077b5319f84e (diff) | |
fix to use big typing notification icon if it's present
git-svn-id: http://svn.miranda-ng.org/main/trunk@2877 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/TabSRMM')
| -rw-r--r-- | plugins/TabSRMM/src/generic_msghandlers.cpp | 4 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/include/globals.h | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/plugins/TabSRMM/src/generic_msghandlers.cpp b/plugins/TabSRMM/src/generic_msghandlers.cpp index bffd4951a7..614960613d 100644 --- a/plugins/TabSRMM/src/generic_msghandlers.cpp +++ b/plugins/TabSRMM/src/generic_msghandlers.cpp @@ -1665,7 +1665,9 @@ void TSAPI DM_Typing(TWindowData *dat, bool fForceOff) }
}
if ((GetForegroundWindow() != hwndContainer) || (dat->pContainer->hwndStatus == 0) || (dat->pContainer->hwndActive != hwndDlg))
- SendMessage(hwndContainer, DM_SETICON, (WPARAM)dat, (LPARAM) PluginConfig.g_buttonBarIcons[ICON_DEFAULT_TYPING]);
+ SendMessage(hwndContainer, DM_SETICON, (WPARAM)dat, (LPARAM)
+ ((PluginConfig.g_IconTypingEventBig != NULL) ? PluginConfig.g_IconTypingEventBig : PluginConfig.g_buttonBarIcons[ICON_DEFAULT_TYPING]));
+
dat->showTyping = 1;
}
}
diff --git a/plugins/TabSRMM/src/include/globals.h b/plugins/TabSRMM/src/include/globals.h index 69d62f66f7..8b4955e454 100644 --- a/plugins/TabSRMM/src/include/globals.h +++ b/plugins/TabSRMM/src/include/globals.h @@ -110,20 +110,20 @@ public: HWND g_hwndHotkeyHandler;
HICON g_iconIn, g_iconOut, g_iconErr, g_iconContainer, g_iconStatus;
- HICON g_iconOverlayDisabled, g_iconOverlayEnabled, g_iconClock;
+ HICON g_iconOverlayDisabled, g_iconOverlayEnabled, g_iconClock;
HCURSOR hCurSplitNS, hCurSplitWE, hCurHyperlinkHand;
HBITMAP g_hbmUnknown;
int g_MetaContactsAvail, g_SmileyAddAvail, g_WantIEView, g_PopupAvail, g_PopupWAvail, g_WantHPP;
int g_FlashAvatarAvail;
HIMAGELIST g_hImageList;
HICON g_IconMsgEvent, g_IconTypingEvent, g_IconFileEvent, g_IconSend;
- HICON g_IconMsgEventBig, g_IconTypingEventBig;
+ HICON g_IconMsgEventBig, g_IconTypingEventBig;
HICON g_IconFolder, g_IconChecked, g_IconUnchecked;
HMENU g_hMenuContext, g_hMenuContainer, g_hMenuEncoding, g_hMenuTrayUnread;
HMENU g_hMenuFavorites, g_hMenuRecent, g_hMenuTrayContext;
HICON g_buttonBarIcons[NR_BUTTONBARICONS];
HICON g_sideBarIcons[NR_SIDEBARICONS];
- HANDLE g_buttonBarIconHandles[23];
+ HANDLE g_buttonBarIconHandles[23];
// dynamic options, need reload when options change
int m_SendOnShiftEnter;
int m_SendOnEnter;
|