diff options
| author | George Hazan <ghazan@miranda.im> | 2023-03-29 14:39:25 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2023-03-29 14:39:25 +0300 |
| commit | ed9ebbcc1c9dd8dd7583ac5f5b4260a41ae84079 (patch) | |
| tree | 285798317245f13a1ef0ce6891ce3a06566b8ecd | |
| parent | 0868340cf0cdb100caf7f124069d98548ec00bd2 (diff) | |
fixes #3375 (StdMsg: double click in the log window does nothing)
| -rw-r--r-- | plugins/Scriver/src/chat_main.cpp | 2 | ||||
| -rw-r--r-- | plugins/Scriver/src/msgdialog.cpp | 4 | ||||
| -rw-r--r-- | src/core/stdmsg/src/msgdialog.cpp | 9 | ||||
| -rw-r--r-- | src/mir_core/src/Windows/CCtrlPages.cpp | 2 |
4 files changed, 5 insertions, 12 deletions
diff --git a/plugins/Scriver/src/chat_main.cpp b/plugins/Scriver/src/chat_main.cpp index 12acbf6113..0297bbef01 100644 --- a/plugins/Scriver/src/chat_main.cpp +++ b/plugins/Scriver/src/chat_main.cpp @@ -125,7 +125,7 @@ static void ShowRoom(SESSION_INFO *si) else pDlg = si->pDlg;
pDlg->UpdateTabControl();
- SendMessage(pDlg->GetHwnd(), WM_MOUSEACTIVATE, 0, 0);
+ SendMessage(pDlg->GetHwnd(), WM_ACTIVATE, WA_ACTIVE, 0);
SetFocus(GetDlgItem(pDlg->GetHwnd(), IDC_SRMM_MESSAGE));
}
diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp index 12bfe4855d..8b9778537f 100644 --- a/plugins/Scriver/src/msgdialog.cpp +++ b/plugins/Scriver/src/msgdialog.cpp @@ -1069,7 +1069,7 @@ INT_PTR CMsgDialog::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam) FixTabIcons();
if (!m_si->pDlg) {
g_chatApi.ShowRoom(m_si);
- SendMessage(m_hwnd, WM_MOUSEACTIVATE, 0, 0);
+ SendMessage(m_hwnd, WM_ACTIVATE, WA_ACTIVE, 0);
}
break;
}
@@ -1079,8 +1079,6 @@ INT_PTR CMsgDialog::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam) if (LOWORD(wParam) != WA_ACTIVE)
break;
- __fallthrough;
- case WM_MOUSEACTIVATE:
if (isChat()) {
SetFocus(m_message.GetHwnd());
diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp index d1c05cfe85..f3626d1180 100644 --- a/src/core/stdmsg/src/msgdialog.cpp +++ b/src/core/stdmsg/src/msgdialog.cpp @@ -725,14 +725,9 @@ INT_PTR CMsgDialog::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam) SetFocus(m_message.GetHwnd());
break;
- case WM_ACTIVATE:
- if (LOWORD(wParam) != WA_ACTIVE)
- break;
-
- __fallthrough;
-
case WM_MOUSEACTIVATE:
- OnActivate();
+ if (LOWORD(wParam) == WA_ACTIVE)
+ OnActivate();
break;
}
diff --git a/src/mir_core/src/Windows/CCtrlPages.cpp b/src/mir_core/src/Windows/CCtrlPages.cpp index 8d7e120f13..7060c9b751 100644 --- a/src/mir_core/src/Windows/CCtrlPages.cpp +++ b/src/mir_core/src/Windows/CCtrlPages.cpp @@ -167,7 +167,7 @@ void CCtrlPages::ActivatePage(int iPage) TabCtrl_SetCurSel(m_hwnd, iPage);
ShowPage(m_pActivePage);
}
- ::SendMessage(m_pActivePage->GetHwnd(), WM_MOUSEACTIVATE, 0, 0);
+ ::SendMessage(m_pActivePage->GetHwnd(), WM_ACTIVATE, WA_ACTIVE, 0);
}
void CCtrlPages::CheckRowCount()
|