diff options
| author | George Hazan <ghazan@miranda.im> | 2017-04-12 13:12:29 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2017-04-12 13:12:37 +0300 |
| commit | 78f4e3d07a8d405e642bec6a40e74d57fe9073c6 (patch) | |
| tree | fa9bd41e0f040e24de5ed30c278a92d149898fdd | |
| parent | b17edd86654fa52cac4d05d02b085e0941552de7 (diff) | |
fix for a tab icon for message sessions
| -rw-r--r-- | plugins/Scriver/src/tabs.cpp | 2 | ||||
| -rw-r--r-- | src/core/stdmsg/src/chat_manager.cpp | 2 | ||||
| -rw-r--r-- | src/core/stdmsg/src/stdafx.h | 1 | ||||
| -rw-r--r-- | src/core/stdmsg/src/tabs.cpp | 2 |
4 files changed, 6 insertions, 1 deletions
diff --git a/plugins/Scriver/src/tabs.cpp b/plugins/Scriver/src/tabs.cpp index 39202809d0..f6d5032be8 100644 --- a/plugins/Scriver/src/tabs.cpp +++ b/plugins/Scriver/src/tabs.cpp @@ -163,7 +163,7 @@ static int AddOrReplaceIcon(HIMAGELIST hList, int prevIndex, HICON hIcon) else prevIndex = g_dat.tabIconListUsage[usageIdx].index;
g_dat.tabIconListUsage[usageIdx].used = 1;
- g_dat.tabIconListUsage[usageIdx].index = (int)ImageList_ReplaceIcon(hList, prevIndex, hIcon);
+ g_dat.tabIconListUsage[usageIdx].index = ImageList_ReplaceIcon(hList, prevIndex, hIcon);
return g_dat.tabIconListUsage[usageIdx].index;
}
diff --git a/src/core/stdmsg/src/chat_manager.cpp b/src/core/stdmsg/src/chat_manager.cpp index 4ae765f651..119914b7c2 100644 --- a/src/core/stdmsg/src/chat_manager.cpp +++ b/src/core/stdmsg/src/chat_manager.cpp @@ -87,6 +87,8 @@ static void OnCreateModule(MODULEINFO *mi) mi->hOfflineIcon = ImageList_GetIcon(hIconsList, mi->OfflineIconIndex, ILD_TRANSPARENT); mi->hOfflineTalkIcon = ImageList_GetIcon(hIconsList, mi->OfflineIconIndex, ILD_TRANSPARENT | INDEXTOOVERLAYMASK(1)); ImageList_AddIcon(hIconsList, mi->hOfflineTalkIcon); + + g_iMessageIconIndex = ImageList_AddIcon(hIconsList, Skin_LoadIcon(SKINICON_EVENT_MESSAGE)); } static void OnReplaceSession(SESSION_INFO *si) diff --git a/src/core/stdmsg/src/stdafx.h b/src/core/stdmsg/src/stdafx.h index 820fc8d910..c3e8cdabd8 100644 --- a/src/core/stdmsg/src/stdafx.h +++ b/src/core/stdmsg/src/stdafx.h @@ -114,6 +114,7 @@ extern HIMAGELIST hIconsList; extern HINSTANCE g_hInst;
extern BOOL SmileyAddInstalled, PopupInstalled;
+extern int g_iMessageIconIndex;
// main.cpp
void LoadIcons(void);
diff --git a/src/core/stdmsg/src/tabs.cpp b/src/core/stdmsg/src/tabs.cpp index a3f9ed91d8..4826653607 100644 --- a/src/core/stdmsg/src/tabs.cpp +++ b/src/core/stdmsg/src/tabs.cpp @@ -41,6 +41,7 @@ void TB_SaveSession(SESSION_INFO *si) } CTabbedWindow *pDialog = nullptr; +int g_iMessageIconIndex; ///////////////////////////////////////////////////////////////////////////////////////// @@ -197,6 +198,7 @@ void CTabbedWindow::FixTabIcons(CSrmmBaseDialog *pDlg) image++; } } + else image = g_iMessageIconIndex; TCITEM tci = {}; tci.mask = TCIF_IMAGE; |