diff options
Diffstat (limited to 'plugins/TabSRMM/src/msgdialog.cpp')
| -rw-r--r-- | plugins/TabSRMM/src/msgdialog.cpp | 43 |
1 files changed, 7 insertions, 36 deletions
diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp index 13aa569bbf..3689ee7b3d 100644 --- a/plugins/TabSRMM/src/msgdialog.cpp +++ b/plugins/TabSRMM/src/msgdialog.cpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////////////
// Miranda NG: the free IM client for Microsoft* Windows*
//
-// Copyright (C) 2012-24 Miranda NG team,
+// Copyright (C) 2012-25 Miranda NG team,
// Copyright (c) 2000-09 Miranda ICQ/IM project,
// all portions of this codebase are copyrighted to the people
// listed in contributors.txt.
@@ -332,9 +332,7 @@ CMsgDialog::CMsgDialog(int iDlgId, MCONTACT hContact) : m_btnQuote.OnClick = Callback(this, &CMsgDialog::onClick_Quote);
if (m_si) {
- m_btnFilter.OnClick = Callback(this, &CMsgDialog::onClick_Filter);
m_btnNickList.OnClick = Callback(this, &CMsgDialog::onClick_ShowNickList);
-
m_nickList.OnDblClick = Callback(this, &CMsgDialog::onDblClick_List);
}
else {
@@ -576,8 +574,8 @@ bool CMsgDialog::OnInitDialog() while (MEVENT hdbEvent = pCursor.FetchNext()) {
DBEVENTINFO dbei = {};
db_event_get(hdbEvent, &dbei);
- if (dbei.eventType == EVENTTYPE_MESSAGE && !(dbei.flags & DBEF_SENT)) {
- m_lastMessage = dbei.timestamp;
+ if (dbei.eventType == EVENTTYPE_MESSAGE && !dbei.bSent) {
+ m_lastMessage = dbei.getUnixtime();
DM_UpdateLastMessage();
break;
}
@@ -614,7 +612,7 @@ bool CMsgDialog::OnInitDialog() m_bWasBackgroundCreate = m_bNeedCheckSize = m_bDeferredScroll = true;
}
- if (isChat()) {
+ if (isChat() && !g_plugin.bApplyPrivateSettings) {
m_pContainer->m_hwndActive = m_hwnd;
ShowWindow(m_hwnd, SW_SHOW);
}
@@ -912,25 +910,6 @@ void CMsgDialog::onClick_CancelAdd(CCtrlButton*) Resize();
}
-void CMsgDialog::onClick_Filter(CCtrlButton *pButton)
-{
- if (!pButton->Enabled())
- return;
-
- m_bFilterEnabled = !m_bFilterEnabled;
- UpdateFilterButton();
-
- if (m_bFilterEnabled && !g_chatApi.bRightClickFilter)
- ShowFilterMenu();
- else {
- if (m_hwndFilter)
- SendMessage(m_hwndFilter, WM_CLOSE, 0, 0);
-
- RedrawLog();
- UpdateTitle();
- }
-}
-
void CMsgDialog::onClick_ShowNickList(CCtrlButton *pButton)
{
if (!pButton->Enabled() || m_si->iType == GCW_SERVER)
@@ -1807,7 +1786,8 @@ LRESULT CMsgDialog::WndProc_Message(UINT msg, WPARAM wParam, LPARAM lParam) }
if (isCtrl && !isAlt && !isShift) {
- if (wParam == VK_UP || wParam == VK_DOWN) { // input history scrolling (ctrl-up / down)
+ // input history scrolling (ctrl-up / down)
+ if (g_plugin.bScrollHistory && (wParam == VK_UP || wParam == VK_DOWN)) {
m_cache->inputHistoryEvent(wParam);
return 0;
}
@@ -1903,16 +1883,7 @@ LRESULT CMsgDialog::WndProc_Message(UINT msg, WPARAM wParam, LPARAM lParam) return TRUE;
}
- auto ret = CSuper::WndProc_Message(msg, wParam, lParam);
-
- switch (msg) {
- case EM_PASTESPECIAL:
- case WM_PASTE:
- if (m_bIsAutosizingInput)
- SendMessage(m_message.GetHwnd(), EM_SETSEL, 0, 0);
- }
-
- return ret;
+ return CSuper::WndProc_Message(msg, wParam, lParam);
}
/////////////////////////////////////////////////////////////////////////////////////////
|