From dd12ff36453d84e83e5e80740d36992c77b95227 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Thu, 28 Jun 2018 12:32:53 +0300
Subject: tabSRMM: horizontal splitter must have the same height in both chats
 & group chats

---
 plugins/TabSRMM/src/chat_window.cpp | 12 ++++++------
 plugins/TabSRMM/src/msgdialog.cpp   |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'plugins')

diff --git a/plugins/TabSRMM/src/chat_window.cpp b/plugins/TabSRMM/src/chat_window.cpp
index a90b623c70..1f2e3d9920 100644
--- a/plugins/TabSRMM/src/chat_window.cpp
+++ b/plugins/TabSRMM/src/chat_window.cpp
@@ -281,7 +281,7 @@ int CChatRoomDlg::Resizer(UTILRESIZECONTROL *urc)
 		urc->rcItem.top = 0;
 		urc->rcItem.left = 0;
 		urc->rcItem.right = bNick ? urc->dlgNewSize.cx - iSplitterX : urc->dlgNewSize.cx;
-		urc->rcItem.bottom = urc->dlgNewSize.cy - m_iSplitterY - DPISCALEY_S(23);
+		urc->rcItem.bottom = urc->dlgNewSize.cy - m_iSplitterY;
 		if (!bToolbar || bBottomToolbar)
 			urc->rcItem.bottom += DPISCALEY_S(21);
 		if (bInfoPanel)
@@ -301,7 +301,7 @@ int CChatRoomDlg::Resizer(UTILRESIZECONTROL *urc)
 		urc->rcItem.top = 0;
 		urc->rcItem.right = urc->dlgNewSize.cx;
 		urc->rcItem.left = urc->dlgNewSize.cx - iSplitterX + 2;
-		urc->rcItem.bottom = urc->dlgNewSize.cy - m_iSplitterY - DPISCALEY_S(23);
+		urc->rcItem.bottom = urc->dlgNewSize.cy - m_iSplitterY;
 		if (!bToolbar || bBottomToolbar)
 			urc->rcItem.bottom += DPISCALEY_S(21);
 		if (bInfoPanel)
@@ -320,7 +320,7 @@ int CChatRoomDlg::Resizer(UTILRESIZECONTROL *urc)
 	case IDC_SPLITTERX:
 		urc->rcItem.right = urc->dlgNewSize.cx - iSplitterX + 2;
 		urc->rcItem.left = urc->dlgNewSize.cx - iSplitterX;
-		urc->rcItem.bottom = urc->dlgNewSize.cy - m_iSplitterY - DPISCALEY_S(23);
+		urc->rcItem.bottom = urc->dlgNewSize.cy - m_iSplitterY;
 		if (!bToolbar || bBottomToolbar)
 			urc->rcItem.bottom += DPISCALEY_S(21);
 		urc->rcItem.top = 0;
@@ -330,7 +330,7 @@ int CChatRoomDlg::Resizer(UTILRESIZECONTROL *urc)
 
 	case IDC_SPLITTERY:
 		urc->rcItem.right = urc->dlgNewSize.cx;
-		urc->rcItem.top = urc->dlgNewSize.cy - m_iSplitterY;
+		urc->rcItem.top = urc->dlgNewSize.cy - m_iSplitterY + DPISCALEY_S(23);
 		urc->rcItem.bottom = urc->rcItem.top + DPISCALEY_S(2);
 		urc->rcItem.left = 0;
 		urc->rcItem.bottom++;
@@ -339,7 +339,7 @@ int CChatRoomDlg::Resizer(UTILRESIZECONTROL *urc)
 
 	case IDC_SRMM_MESSAGE:
 		urc->rcItem.right = urc->dlgNewSize.cx;
-		urc->rcItem.top = urc->dlgNewSize.cy - m_iSplitterY + 3;
+		urc->rcItem.top = urc->dlgNewSize.cy - m_iSplitterY + 3 + DPISCALEY_S(23);
 		urc->rcItem.bottom = urc->dlgNewSize.cy;
 		if (bBottomToolbar && bToolbar)
 			urc->rcItem.bottom -= DPISCALEY_S(22);
@@ -1881,7 +1881,7 @@ INT_PTR CChatRoomDlg::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam)
 			pt.x = 0, pt.y = wParam;
 			ScreenToClient(m_hwnd, &pt);
 
-			m_iSplitterY = rc.bottom - pt.y + DPISCALEY_S(1);
+			m_iSplitterY = rc.bottom - pt.y + 3 + DPISCALEY_S(23);
 			int iMinHeight = DPISCALEY_S(23) + ((m_pContainer->dwFlags & CNT_BOTTOMTOOLBAR) ? 21 : 0);
 			if (m_iSplitterY < iMinHeight)
 				m_iSplitterY = iMinHeight;
diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp
index e30515353e..4c7ddf8301 100644
--- a/plugins/TabSRMM/src/msgdialog.cpp
+++ b/plugins/TabSRMM/src/msgdialog.cpp
@@ -1321,7 +1321,7 @@ int CSrmmWindow::Resizer(UTILRESIZECONTROL *urc)
 			urc->rcItem.right -= (m_iMultiSplit + 3);
 		urc->rcItem.bottom -= m_iSplitterY - m_originalSplitterY;
 		if (!bShowToolbar || bBottomToolbar)
-			urc->rcItem.bottom += 21;
+			urc->rcItem.bottom += DPISCALEY_S(21);
 		if (bInfoPanel)
 			urc->rcItem.top += panelHeight;
 		urc->rcItem.bottom += 3;
-- 
cgit v1.2.3