diff options
| author | George Hazan <ghazan@miranda.im> | 2020-08-16 18:19:00 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2020-08-16 18:19:00 +0300 |
| commit | cbae3129961119ea4415ec2643bb62f04be47dcf (patch) | |
| tree | e96bdbbe0247f814898b13d494d8a1d5351ce4e0 /plugins | |
| parent | d11b65ef96075a0da05d88913c6bcea619a4c2f9 (diff) | |
fixes #2538 (NewStory: add stickers support to message log and history)
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/ExternalAPI/m_text.h | 2 | ||||
| -rw-r--r-- | plugins/NewStory/src/history_array.cpp | 2 | ||||
| -rw-r--r-- | plugins/Popup/src/popup_wnd2.cpp | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/plugins/ExternalAPI/m_text.h b/plugins/ExternalAPI/m_text.h index 5e10383bb5..0780b58bd1 100644 --- a/plugins/ExternalAPI/m_text.h +++ b/plugins/ExternalAPI/m_text.h @@ -47,7 +47,7 @@ enum MTEXTCONTROL_DLL(HANDLE) MTextRegister(const char *userTitle, DWORD options);
// allocate text object (unicode)
-MTEXTCONTROL_DLL(HANDLE) MTextCreateW(HANDLE userHandle, WCHAR *text);
+MTEXTCONTROL_DLL(HANDLE) MTextCreateW(HANDLE userHandle, const char *szProto, const wchar_t *text);
// allocate text object (advanced)
MTEXTCONTROL_DLL(HANDLE) MTextCreateEx(HANDLE userHandle, void *text, DWORD flags);
diff --git a/plugins/NewStory/src/history_array.cpp b/plugins/NewStory/src/history_array.cpp index 33724bdff5..ecfc72caa0 100644 --- a/plugins/NewStory/src/history_array.cpp +++ b/plugins/NewStory/src/history_array.cpp @@ -49,7 +49,7 @@ bool Filter::check(ItemData *item) void ItemData::checkCreate(HWND hwnd) { if (data == nullptr) { - data = MTextCreateW(htuLog, ptrW(TplFormatString(getTemplate(), hContact, this))); + data = MTextCreateW(htuLog, Proto_GetBaseAccountName(hContact), ptrW(TplFormatString(getTemplate(), hContact, this))); MTextSetParent(data, hwnd); } } diff --git a/plugins/Popup/src/popup_wnd2.cpp b/plugins/Popup/src/popup_wnd2.cpp index 3c0d1a96c3..cdc4a76c02 100644 --- a/plugins/Popup/src/popup_wnd2.cpp +++ b/plugins/Popup/src/popup_wnd2.cpp @@ -740,9 +740,10 @@ void PopupWnd2::buildMText() m_mtText = m_mtTitle = nullptr;
if (m_lptzText && m_lptzTitle) {
+ auto *szProto = Proto_GetBaseAccountName(m_hContact);
m_textType = TT_MTEXT;
- m_mtText = MTextCreateW(htuText, m_lptzText);
- m_mtTitle = MTextCreateW(htuTitle, m_lptzTitle);
+ m_mtText = MTextCreateW(htuText, szProto, m_lptzText);
+ m_mtTitle = MTextCreateW(htuTitle, szProto, m_lptzTitle);
}
}
|