fixes #3375 (StdMsg: double click in the log window does nothing)

miranda-ng · Apr 17, 2023 · b4ce59b · b4ce59b
1 parent 3e8d911
commit b4ce59b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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()