splitter data removed from common chat session settings

4 files changed, 38 insertions, 26 deletions

diff --git a/src/core/stdmsg/src/chat_manager.cpp b/src/core/stdmsg/src/chat_manager.cpp
index fef5ad0327..0041d3ea6f 100644
--- a/src/core/stdmsg/src/chat_manager.cpp
+++ b/src/core/stdmsg/src/chat_manager.cpp
@@ -157,6 +157,13 @@ static void OnLoadSettings()
 	g_Settings.bTabRestore = db_get_b(NULL, CHAT_MODULE, "TabRestore", 0) != 0;
 	g_Settings.bTabsAtBottom = db_get_b(NULL, CHAT_MODULE, "TabBottom", 0) != 0;
 	g_Settings.bTabCloseOnDblClick = db_get_b(NULL, CHAT_MODULE, "TabCloseOnDblClick", 0) != 0;
+
+	g_Settings.iSplitterX = db_get_w(NULL, CHAT_MODULE, "SplitterX", 105);
+	if (g_Settings.iSplitterX <= 50)
+		g_Settings.iSplitterX = 105;
+	g_Settings.iSplitterY = db_get_w(NULL, CHAT_MODULE, "SplitterY", 90);
+	if (g_Settings.iSplitterY <= 65)
+		g_Settings.iSplitterY = 90;
 }
 
 static void RegisterFonts()
diff --git a/src/core/stdmsg/src/chat_window.cpp b/src/core/stdmsg/src/chat_window.cpp
index 553328c02f..9e2e472961 100644
--- a/src/core/stdmsg/src/chat_window.cpp
+++ b/src/core/stdmsg/src/chat_window.cpp
@@ -48,16 +48,16 @@ int CChatRoomDlg::Resizer(UTILRESIZECONTROL *urc)
 	case IDOK:
 		GetWindowRect(m_hwndStatus, &rc);
 		urc->rcItem.left = bSend ? 315 : urc->dlgNewSize.cx;
-		urc->rcItem.top = urc->dlgNewSize.cy - si->iSplitterY + 23;
+		urc->rcItem.top = urc->dlgNewSize.cy - m_iSplitterY + 23;
 		urc->rcItem.bottom = urc->dlgNewSize.cy - (rc.bottom - rc.top) - 1;
 		return RD_ANCHORX_RIGHT | RD_ANCHORY_CUSTOM;
 
 	case IDC_LOG:
 		urc->rcItem.top = 2;
 		urc->rcItem.left = 0;
-		urc->rcItem.right = bNick ? urc->dlgNewSize.cx - si->iSplitterX : urc->dlgNewSize.cx;
+		urc->rcItem.right = bNick ? urc->dlgNewSize.cx - m_iSplitterX : urc->dlgNewSize.cx;
 LBL_CalcBottom:
-		urc->rcItem.bottom = urc->dlgNewSize.cy - si->iSplitterY;
+		urc->rcItem.bottom = urc->dlgNewSize.cy - m_iSplitterY;
 		if (!bToolbar)
 			urc->rcItem.bottom += 20;
 		return RD_ANCHORX_CUSTOM | RD_ANCHORY_CUSTOM;
@@ -65,17 +65,17 @@ LBL_CalcBottom:
 	case IDC_LIST:
 		urc->rcItem.top = 2;
 		urc->rcItem.right = urc->dlgNewSize.cx;
-		urc->rcItem.left = urc->dlgNewSize.cx - si->iSplitterX + 2;
+		urc->rcItem.left = urc->dlgNewSize.cx - m_iSplitterX + 2;
 		goto LBL_CalcBottom;
 
 	case IDC_SPLITTERX:
 		urc->rcItem.top = 1;
-		urc->rcItem.left = urc->dlgNewSize.cx - si->iSplitterX;
+		urc->rcItem.left = urc->dlgNewSize.cx - m_iSplitterX;
 		urc->rcItem.right = urc->rcItem.left + 2;
 		goto LBL_CalcBottom;
 
 	case IDC_SPLITTERY:
-		urc->rcItem.top = urc->dlgNewSize.cy - si->iSplitterY;
+		urc->rcItem.top = urc->dlgNewSize.cy - m_iSplitterY;
 		if (!bToolbar)
 			urc->rcItem.top += 20;
 		urc->rcItem.bottom = urc->rcItem.top + 2;
@@ -84,7 +84,7 @@ LBL_CalcBottom:
 	case IDC_MESSAGE:
 		GetWindowRect(m_hwndStatus, &rc);
 		urc->rcItem.right = bSend ? urc->dlgNewSize.cx - 64 : urc->dlgNewSize.cx;
-		urc->rcItem.top = urc->dlgNewSize.cy - si->iSplitterY + 22;
+		urc->rcItem.top = urc->dlgNewSize.cy - m_iSplitterY + 22;
 		urc->rcItem.bottom = urc->dlgNewSize.cy - (rc.bottom - rc.top) - 1;
 		return RD_ANCHORX_LEFT | RD_ANCHORY_CUSTOM;
 	}
@@ -874,6 +874,9 @@ CChatRoomDlg::CChatRoomDlg(SESSION_INFO *si) :
 
 	m_splitterX.OnChange = Callback(this, &CChatRoomDlg::OnSplitterX);
 	m_splitterY.OnChange = Callback(this, &CChatRoomDlg::OnSplitterY);
+
+	m_iSplitterX = g_Settings.iSplitterX;
+	m_iSplitterY = g_Settings.iSplitterY;
 }
 
 void CChatRoomDlg::OnInitDialog()
@@ -1109,12 +1112,12 @@ void CChatRoomDlg::OnSplitterX(CSplitter *pSplitter)
 	RECT rc;
 	GetClientRect(m_hwnd, &rc);
 
-	m_si->iSplitterX = rc.right - pSplitter->GetPos() + 1;
-	if (m_si->iSplitterX < 35)
-		m_si->iSplitterX = 35;
-	if (m_si->iSplitterX > rc.right - rc.left - 35)
-		m_si->iSplitterX = rc.right - rc.left - 35;
-	g_Settings.iSplitterX = m_si->iSplitterX;
+	m_iSplitterX = rc.right - pSplitter->GetPos() + 1;
+	if (m_iSplitterX < 35)
+		m_iSplitterX = 35;
+	if (m_iSplitterX > rc.right - rc.left - 35)
+		m_iSplitterX = rc.right - rc.left - 35;
+	g_Settings.iSplitterX = m_iSplitterX;
 }
 
 void CChatRoomDlg::OnSplitterY(CSplitter *pSplitter)
@@ -1122,15 +1125,15 @@ void CChatRoomDlg::OnSplitterY(CSplitter *pSplitter)
 	RECT rc;
 	GetClientRect(m_hwnd, &rc);
 
-	m_si->iSplitterY = rc.bottom - pSplitter->GetPos() + 1;
+	m_iSplitterY = rc.bottom - pSplitter->GetPos() + 1;
 	if (!IsWindowVisible(m_btnBold.GetHwnd()))
-		m_si->iSplitterY += 19;
+		m_iSplitterY += 19;
 
-	if (m_si->iSplitterY < 63)
-		m_si->iSplitterY = 63;
-	if (m_si->iSplitterY > rc.bottom - rc.top - 40)
-		m_si->iSplitterY = rc.bottom - rc.top - 40;
-	g_Settings.iSplitterY = m_si->iSplitterY;
+	if (m_iSplitterY < 63)
+		m_iSplitterY = 63;
+	if (m_iSplitterY > rc.bottom - rc.top - 40)
+		m_iSplitterY = rc.bottom - rc.top - 40;
+	g_Settings.iSplitterY = m_iSplitterY;
 }
 
 void CChatRoomDlg::SetWindowPosition()
@@ -1778,11 +1781,11 @@ LABEL_SHOWWINDOW:
 	case WM_GETMINMAXINFO:
 		{
 			MINMAXINFO *mmi = (MINMAXINFO*)lParam;
-			mmi->ptMinTrackSize.x = m_si->iSplitterX + 43;
+			mmi->ptMinTrackSize.x = m_iSplitterX + 43;
 			if (mmi->ptMinTrackSize.x < 350)
 				mmi->ptMinTrackSize.x = 350;
 
-			mmi->ptMinTrackSize.y = m_si->iSplitterY + 80;
+			mmi->ptMinTrackSize.y = m_iSplitterY + 80;
 		}
 		break;
 
diff --git a/src/core/stdmsg/src/msgs.h b/src/core/stdmsg/src/msgs.h
index 9cfe81aa0b..56344e490a 100644
--- a/src/core/stdmsg/src/msgs.h
+++ b/src/core/stdmsg/src/msgs.h
@@ -82,8 +82,7 @@ public:
 	MEVENT m_hDbEventFirst, m_hDbEventLast;

 	bool m_bIsAutoRTL;

 

-	int m_avatarWidth;

-	int m_avatarHeight;

+	int m_avatarWidth, m_avatarHeight;

 	int m_splitterPos, m_originalSplitterPos;

 	int m_lineHeight;

 

diff --git a/src/core/stdmsg/src/stdafx.h b/src/core/stdmsg/src/stdafx.h
index 5248b2a200..9fe02becd0 100644
--- a/src/core/stdmsg/src/stdafx.h
+++ b/src/core/stdmsg/src/stdafx.h
@@ -99,8 +99,9 @@ struct LOGSTREAMDATA : public GCLogStreamDataBase {};
 

 struct GlobalLogSettings : public GlobalLogSettingsBase

 {

-	int   iX, iY;

-	bool  bTabsEnable, bTabsAtBottom, bTabCloseOnDblClick, bTabRestore;

+	int iX, iY;

+	int iSplitterX, iSplitterY;

+	bool bTabsEnable, bTabsAtBottom, bTabCloseOnDblClick, bTabRestore;

 

 	HFONT MessageAreaFont;

 	COLORREF MessageAreaColor;

@@ -192,6 +193,8 @@ class CChatRoomDlg : public CSrmmBaseDialog
 	void SaveWindowPosition(bool bUpdateSession);

 	void SetWindowPosition();

 

+	int m_iSplitterX, m_iSplitterY;

+

 public:

 	CChatRoomDlg(SESSION_INFO*);