From 5268eaf791d272a8e723d9c3533ab714427bb114 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Thu, 17 Oct 2024 19:41:54 +0300
Subject: =?UTF-8?q?fixes=20#4743=20(StdMsg,=20Scriver:=20=D0=BF=D1=80?=
 =?UTF-8?q?=D0=B8=20=D0=BE=D1=82=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B5=20?=
 =?UTF-8?q?=D1=81=D0=BE=D0=BE=D0=B1=D1=89=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BA?=
 =?UTF-8?q?=D0=BD=D0=BE=D0=BF=D0=BA=D0=B8=20=D1=84=D0=BE=D1=80=D0=BC=D0=B0?=
 =?UTF-8?q?=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=BD?=
 =?UTF-8?q?=D0=B5=20"=D0=BE=D1=82=D0=B6=D0=B8=D0=BC=D0=B0=D1=8E=D1=82?=
 =?UTF-8?q?=D1=81=D1=8F")?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mir_app/src/srmm_base.cpp | 48 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

(limited to 'src/mir_app')

diff --git a/src/mir_app/src/srmm_base.cpp b/src/mir_app/src/srmm_base.cpp
index ab0096c557..b6420f9d7b 100644
--- a/src/mir_app/src/srmm_base.cpp
+++ b/src/mir_app/src/srmm_base.cpp
@@ -660,6 +660,54 @@ INT_PTR CSrmmBaseDialog::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam)
 		LPNMHDR hdr = (LPNMHDR)lParam;
 		if (hdr->hwndFrom == m_pLog->GetHwnd())
 			m_pLog->Notify(wParam, lParam);
+		else if (hdr->code == EN_MSGFILTER) {
+			auto *F = ((MSGFILTER *)lParam);
+			if ((F->msg == WM_LBUTTONDOWN || F->msg == WM_KEYUP || F->msg == WM_LBUTTONUP) && F->nmhdr.idFrom == IDC_SRMM_MESSAGE) {
+				int bBold = IsDlgButtonChecked(m_hwnd, IDC_SRMM_BOLD);
+				int bItalic = IsDlgButtonChecked(m_hwnd, IDC_SRMM_ITALICS);
+				int bUnder = IsDlgButtonChecked(m_hwnd, IDC_SRMM_UNDERLINE);
+				int bStrikeout = IsDlgButtonChecked(m_hwnd, IDC_SRMM_STRIKEOUT);
+
+				CHARFORMAT2 cf2;
+				cf2.cbSize = sizeof(CHARFORMAT2);
+				cf2.dwMask = CFM_BOLD | CFM_ITALIC | CFM_UNDERLINE | CFM_UNDERLINETYPE | CFM_STRIKEOUT;
+				cf2.dwEffects = 0;
+				m_message.SendMsg(EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf2);
+				if (cf2.dwEffects & CFE_BOLD) {
+					if (bBold == BST_UNCHECKED)
+						CheckDlgButton(m_hwnd, IDC_SRMM_BOLD, BST_CHECKED);
+				}
+				else if (bBold == BST_CHECKED)
+					CheckDlgButton(m_hwnd, IDC_SRMM_BOLD, BST_UNCHECKED);
+
+				if (cf2.dwEffects & CFE_ITALIC) {
+					if (bItalic == BST_UNCHECKED)
+						CheckDlgButton(m_hwnd, IDC_SRMM_ITALICS, BST_CHECKED);
+				}
+				else if (bItalic == BST_CHECKED)
+					CheckDlgButton(m_hwnd, IDC_SRMM_ITALICS, BST_UNCHECKED);
+
+				if (cf2.dwEffects & CFE_UNDERLINE && (cf2.bUnderlineType & CFU_UNDERLINE || cf2.bUnderlineType & CFU_UNDERLINEWORD)) {
+					if (bUnder == BST_UNCHECKED)
+						CheckDlgButton(m_hwnd, IDC_SRMM_UNDERLINE, BST_CHECKED);
+				}
+				else if (bUnder == BST_CHECKED)
+					CheckDlgButton(m_hwnd, IDC_SRMM_UNDERLINE, BST_UNCHECKED);
+
+				if (cf2.dwEffects & CFE_STRIKEOUT) {
+					if (bStrikeout == BST_UNCHECKED)
+						CheckDlgButton(m_hwnd, IDC_SRMM_STRIKEOUT, BST_CHECKED);
+				}
+				else if (bStrikeout == BST_CHECKED)
+					CheckDlgButton(m_hwnd, IDC_SRMM_STRIKEOUT, BST_UNCHECKED);
+			}
+
+			if ((hdr->idFrom == IDC_SRMM_LOG || hdr->idFrom == IDC_SRMM_MESSAGE) && F->msg == WM_RBUTTONUP) {
+				SetWindowLongPtr(m_hwnd, DWLP_MSGRESULT, TRUE);
+				return TRUE;
+			}
+
+		}
 		break;
 	}
 
-- 
cgit v1.2.3