Scriver: fix for dynamic entry field height

2 files changed, 57 insertions, 57 deletions

diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp
index b47ae074f9..c642e0e422 100644
--- a/plugins/Scriver/src/msgdialog.cpp
+++ b/plugins/Scriver/src/msgdialog.cpp
@@ -837,7 +837,7 @@ void CSrmmWindow::MessageDialogResize(int w, int h)
 		infobarInnerHeight = 0;

 	}

 

-	if (hSplitterPos >(h - toolbarHeight - infobarHeight + SPLITTER_HEIGHT + 1) / 2)

+	if (hSplitterPos > (h - toolbarHeight - infobarHeight + SPLITTER_HEIGHT + 1) / 2)

 		hSplitterPos = (h - toolbarHeight - infobarHeight + SPLITTER_HEIGHT + 1) / 2;

 

 	if (h - hSplitterPos - infobarHeight < hSplitterMinTop)

@@ -1207,6 +1207,7 @@ INT_PTR CSrmmWindow::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam)
 			m_hwndIeview = nullptr;

 		}

 

+		m_pParent->iSplitterY = SPLITTER_HEIGHT + 1;

 		SendMessage(m_hwnd, DM_GETAVATAR, 0, 0);

 		SetDialogToType();

 		{

diff --git a/plugins/Scriver/src/msgoptions.cpp b/plugins/Scriver/src/msgoptions.cpp
index b1c4ff16df..e790cd41a1 100644
--- a/plugins/Scriver/src/msgoptions.cpp
+++ b/plugins/Scriver/src/msgoptions.cpp
@@ -27,8 +27,8 @@ INT_PTR CALLBACK DlgProcOptions1(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 INT_PTR CALLBACK DlgProcOptions2(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

 INT_PTR CALLBACK DlgProcOptionsPopup(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);

 

-#define FONTF_BOLD		1

-#define FONTF_ITALIC	2

+#define FONTF_BOLD   1

+#define FONTF_ITALIC 2

 

 struct

 {

@@ -243,7 +243,8 @@ static void ApplyChanges(int i)
 	}

 }

 

-static void MarkChanges(int i, HWND hWnd) {

+static void MarkChanges(int i, HWND hWnd)

+{

 	SendMessage(GetParent(hWnd), PSM_CHANGED, 0, 0);

 	changed |= i;

 }

@@ -377,41 +378,39 @@ static INT_PTR CALLBACK DlgProcTabsOptions(HWND hwndDlg, UINT msg, WPARAM wParam
 static INT_PTR CALLBACK DlgProcLayoutOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

 {

 	int bChecked;

+	char str[10];

 

 	switch (msg) {

 	case WM_INITDIALOG:

-		{

-			char str[10];

-			TranslateDialogDefault(hwndDlg);

-			CheckDlgButton(hwndDlg, IDC_SHOWSTATUSBAR, db_get_b(0, SRMM_MODULE, SRMSGSET_SHOWSTATUSBAR, SRMSGDEFSET_SHOWSTATUSBAR) ? BST_CHECKED : BST_UNCHECKED);

-			CheckDlgButton(hwndDlg, IDC_SHOWTITLEBAR, db_get_b(0, SRMM_MODULE, SRMSGSET_SHOWTITLEBAR, SRMSGDEFSET_SHOWTITLEBAR) ? BST_CHECKED : BST_UNCHECKED);

-			CheckDlgButton(hwndDlg, IDC_SHOWTOOLBAR, db_get_b(0, SRMM_MODULE, SRMSGSET_SHOWBUTTONLINE, SRMSGDEFSET_SHOWBUTTONLINE) ? BST_CHECKED : BST_UNCHECKED);

-			CheckDlgButton(hwndDlg, IDC_SHOWINFOBAR, db_get_b(0, SRMM_MODULE, SRMSGSET_SHOWINFOBAR, SRMSGDEFSET_SHOWINFOBAR) ? BST_CHECKED : BST_UNCHECKED);

-			CheckDlgButton(hwndDlg, IDC_TRANSPARENCY, db_get_b(0, SRMM_MODULE, SRMSGSET_USETRANSPARENCY, SRMSGDEFSET_USETRANSPARENCY) ? BST_CHECKED : BST_UNCHECKED);

-			SendDlgItemMessage(hwndDlg, IDC_ATRANSPARENCYVALUE, TBM_SETRANGE, FALSE, MAKELONG(0,255));

-			SendDlgItemMessage(hwndDlg, IDC_ATRANSPARENCYVALUE, TBM_SETPOS, TRUE, db_get_dw(0, SRMM_MODULE, SRMSGSET_ACTIVEALPHA, SRMSGDEFSET_ACTIVEALPHA));

-			SendDlgItemMessage(hwndDlg, IDC_ITRANSPARENCYVALUE, TBM_SETRANGE, FALSE, MAKELONG(0,255));

-			SendDlgItemMessage(hwndDlg, IDC_ITRANSPARENCYVALUE, TBM_SETPOS, TRUE, db_get_dw(0, SRMM_MODULE, SRMSGSET_INACTIVEALPHA, SRMSGDEFSET_INACTIVEALPHA));

-			mir_snprintf(str, "%d%%", (int)(100 * SendDlgItemMessage(hwndDlg, IDC_ATRANSPARENCYVALUE, TBM_GETPOS, 0, 0) / 255));

-			SetDlgItemTextA(hwndDlg, IDC_ATRANSPARENCYPERC, str);

-			mir_snprintf(str, "%d%%", (int)(100 * SendDlgItemMessage(hwndDlg, IDC_ITRANSPARENCYVALUE, TBM_GETPOS, 0, 0) / 255));

-			SetDlgItemTextA(hwndDlg, IDC_ITRANSPARENCYPERC, str);

-			SendDlgItemMessage(hwndDlg, IDC_INPUTLINESSPIN, UDM_SETRANGE, 0, MAKELONG(100, 1));

-			SendDlgItemMessage(hwndDlg, IDC_INPUTLINESSPIN, UDM_SETPOS, 0, db_get_w(0, SRMM_MODULE, SRMSGSET_AUTORESIZELINES, SRMSGDEFSET_AUTORESIZELINES));

-

-			bChecked = IsDlgButtonChecked(hwndDlg, IDC_TRANSPARENCY);

-			EnableWindow(GetDlgItem(hwndDlg, IDC_ATRANSPARENCYVALUE), bChecked);

-			EnableWindow(GetDlgItem(hwndDlg, IDC_ATRANSPARENCYPERC), bChecked);

-			EnableWindow(GetDlgItem(hwndDlg, IDC_ITRANSPARENCYVALUE), bChecked);

-			EnableWindow(GetDlgItem(hwndDlg, IDC_ITRANSPARENCYPERC), bChecked);

-			EnableWindow(GetDlgItem(hwndDlg, IDC_TRANSPARENCYTEXT1), bChecked);

-			EnableWindow(GetDlgItem(hwndDlg, IDC_TRANSPARENCYTEXT2), bChecked);

+		TranslateDialogDefault(hwndDlg);

+		CheckDlgButton(hwndDlg, IDC_SHOWSTATUSBAR, db_get_b(0, SRMM_MODULE, SRMSGSET_SHOWSTATUSBAR, SRMSGDEFSET_SHOWSTATUSBAR) ? BST_CHECKED : BST_UNCHECKED);

+		CheckDlgButton(hwndDlg, IDC_SHOWTITLEBAR, db_get_b(0, SRMM_MODULE, SRMSGSET_SHOWTITLEBAR, SRMSGDEFSET_SHOWTITLEBAR) ? BST_CHECKED : BST_UNCHECKED);

+		CheckDlgButton(hwndDlg, IDC_SHOWTOOLBAR, db_get_b(0, SRMM_MODULE, SRMSGSET_SHOWBUTTONLINE, SRMSGDEFSET_SHOWBUTTONLINE) ? BST_CHECKED : BST_UNCHECKED);

+		CheckDlgButton(hwndDlg, IDC_SHOWINFOBAR, db_get_b(0, SRMM_MODULE, SRMSGSET_SHOWINFOBAR, SRMSGDEFSET_SHOWINFOBAR) ? BST_CHECKED : BST_UNCHECKED);

+		CheckDlgButton(hwndDlg, IDC_TRANSPARENCY, db_get_b(0, SRMM_MODULE, SRMSGSET_USETRANSPARENCY, SRMSGDEFSET_USETRANSPARENCY) ? BST_CHECKED : BST_UNCHECKED);

+		SendDlgItemMessage(hwndDlg, IDC_ATRANSPARENCYVALUE, TBM_SETRANGE, FALSE, MAKELONG(0, 255));

+		SendDlgItemMessage(hwndDlg, IDC_ATRANSPARENCYVALUE, TBM_SETPOS, TRUE, db_get_dw(0, SRMM_MODULE, SRMSGSET_ACTIVEALPHA, SRMSGDEFSET_ACTIVEALPHA));

+		SendDlgItemMessage(hwndDlg, IDC_ITRANSPARENCYVALUE, TBM_SETRANGE, FALSE, MAKELONG(0, 255));

+		SendDlgItemMessage(hwndDlg, IDC_ITRANSPARENCYVALUE, TBM_SETPOS, TRUE, db_get_dw(0, SRMM_MODULE, SRMSGSET_INACTIVEALPHA, SRMSGDEFSET_INACTIVEALPHA));

+		mir_snprintf(str, "%d%%", (int)(100 * SendDlgItemMessage(hwndDlg, IDC_ATRANSPARENCYVALUE, TBM_GETPOS, 0, 0) / 255));

+		SetDlgItemTextA(hwndDlg, IDC_ATRANSPARENCYPERC, str);

+		mir_snprintf(str, "%d%%", (int)(100 * SendDlgItemMessage(hwndDlg, IDC_ITRANSPARENCYVALUE, TBM_GETPOS, 0, 0) / 255));

+		SetDlgItemTextA(hwndDlg, IDC_ITRANSPARENCYPERC, str);

+		SendDlgItemMessage(hwndDlg, IDC_INPUTLINESSPIN, UDM_SETRANGE, 0, MAKELONG(100, 1));

+		SendDlgItemMessage(hwndDlg, IDC_INPUTLINESSPIN, UDM_SETPOS, 0, db_get_w(0, SRMM_MODULE, SRMSGSET_AUTORESIZELINES, SRMSGDEFSET_AUTORESIZELINES));

+

+		bChecked = IsDlgButtonChecked(hwndDlg, IDC_TRANSPARENCY);

+		EnableWindow(GetDlgItem(hwndDlg, IDC_ATRANSPARENCYVALUE), bChecked);

+		EnableWindow(GetDlgItem(hwndDlg, IDC_ATRANSPARENCYPERC), bChecked);

+		EnableWindow(GetDlgItem(hwndDlg, IDC_ITRANSPARENCYVALUE), bChecked);

+		EnableWindow(GetDlgItem(hwndDlg, IDC_ITRANSPARENCYPERC), bChecked);

+		EnableWindow(GetDlgItem(hwndDlg, IDC_TRANSPARENCYTEXT1), bChecked);

+		EnableWindow(GetDlgItem(hwndDlg, IDC_TRANSPARENCYTEXT2), bChecked);

 

-			CheckDlgButton(hwndDlg, IDC_STATUSWIN, db_get_b(0, SRMM_MODULE, SRMSGSET_STATUSICON, SRMSGDEFSET_STATUSICON) ? BST_CHECKED : BST_UNCHECKED);

-			CheckDlgButton(hwndDlg, IDC_SHOWPROGRESS, db_get_b(0, SRMM_MODULE, SRMSGSET_SHOWPROGRESS, SRMSGDEFSET_SHOWPROGRESS) ? BST_CHECKED : BST_UNCHECKED);

-			CheckDlgButton(hwndDlg, IDC_AVATARSUPPORT, g_dat.flags & SMF_AVATAR);

-			return TRUE;

-		}

+		CheckDlgButton(hwndDlg, IDC_STATUSWIN, db_get_b(0, SRMM_MODULE, SRMSGSET_STATUSICON, SRMSGDEFSET_STATUSICON) ? BST_CHECKED : BST_UNCHECKED);

+		CheckDlgButton(hwndDlg, IDC_SHOWPROGRESS, db_get_b(0, SRMM_MODULE, SRMSGSET_SHOWPROGRESS, SRMSGDEFSET_SHOWPROGRESS) ? BST_CHECKED : BST_UNCHECKED);

+		CheckDlgButton(hwndDlg, IDC_AVATARSUPPORT, g_dat.flags & SMF_AVATAR);

+		return TRUE;

 

 	case WM_COMMAND:

 		switch (LOWORD(wParam)) {

@@ -434,14 +433,11 @@ static INT_PTR CALLBACK DlgProcLayoutOptions(HWND hwndDlg, UINT msg, WPARAM wPar
 		break;

 

 	case WM_HSCROLL:

-		{

-			char str[10];

-			mir_snprintf(str, "%d%%", (int)(100 * SendDlgItemMessage(hwndDlg, IDC_ATRANSPARENCYVALUE, TBM_GETPOS, 0, 0) / 256));

-			SetDlgItemTextA(hwndDlg, IDC_ATRANSPARENCYPERC, str);

-			mir_snprintf(str, "%d%%", (int)(100 * SendDlgItemMessage(hwndDlg, IDC_ITRANSPARENCYVALUE, TBM_GETPOS, 0, 0) / 256));

-			SetDlgItemTextA(hwndDlg, IDC_ITRANSPARENCYPERC, str);

-			MarkChanges(16, hwndDlg);

-		}

+		mir_snprintf(str, "%d%%", (int)(100 * SendDlgItemMessage(hwndDlg, IDC_ATRANSPARENCYVALUE, TBM_GETPOS, 0, 0) / 256));

+		SetDlgItemTextA(hwndDlg, IDC_ATRANSPARENCYPERC, str);

+		mir_snprintf(str, "%d%%", (int)(100 * SendDlgItemMessage(hwndDlg, IDC_ITRANSPARENCYVALUE, TBM_GETPOS, 0, 0) / 256));

+		SetDlgItemTextA(hwndDlg, IDC_ITRANSPARENCYPERC, str);

+		MarkChanges(16, hwndDlg);

 		break;

 

 	case WM_NOTIFY:

@@ -542,21 +538,21 @@ static INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 				hti.pt.x = (short)LOWORD(GetMessagePos());

 				hti.pt.y = (short)HIWORD(GetMessagePos());

 				ScreenToClient(((LPNMHDR)lParam)->hwndFrom, &hti.pt);

-				if (TreeView_HitTest(((LPNMHDR)lParam)->hwndFrom, &hti))

-				if (hti.flags & TVHT_ONITEMSTATEICON) {

-					TVITEM tvi;

-					tvi.mask = TVIF_HANDLE | TVIF_IMAGE | TVIF_SELECTEDIMAGE;

-					tvi.hItem = hti.hItem;

-					TreeView_GetItem(((LPNMHDR)lParam)->hwndFrom, &tvi);

-					tvi.iImage = tvi.iSelectedImage = tvi.iImage == 1 ? 2 : 1;

-					TreeView_SetItem(((LPNMHDR)lParam)->hwndFrom, &tvi);

-					MarkChanges(2, hwndDlg);

+				if (TreeView_HitTest(((LPNMHDR)lParam)->hwndFrom, &hti)) {

+					if (hti.flags & TVHT_ONITEMSTATEICON) {

+						TVITEM tvi;

+						tvi.mask = TVIF_HANDLE | TVIF_IMAGE | TVIF_SELECTEDIMAGE;

+						tvi.hItem = hti.hItem;

+						TreeView_GetItem(((LPNMHDR)lParam)->hwndFrom, &tvi);

+						tvi.iImage = tvi.iSelectedImage = tvi.iImage == 1 ? 2 : 1;

+						TreeView_SetItem(((LPNMHDR)lParam)->hwndFrom, &tvi);

+						MarkChanges(2, hwndDlg);

+					}

 				}

 			}

 			else if (((LPNMHDR)lParam)->code == TVN_KEYDOWN) {

-				if (((LPNMTVKEYDOWN)lParam)->wVKey == VK_SPACE) {

+				if (((LPNMTVKEYDOWN)lParam)->wVKey == VK_SPACE)

 					MarkChanges(2, hwndDlg);

-				}

 			}

 			break;

 

@@ -627,8 +623,7 @@ public:
 	CLogOptionsDlg() :

 		CDlgBase(g_hInst, IDD_OPT_MSGLOG),

 		m_log(this, IDC_SRMM_LOG)

-	{

-	}

+	{}

 

 	virtual void OnInitDialog() override

 	{

@@ -902,12 +897,14 @@ static INT_PTR CALLBACK DlgProcTypeOptions(HWND hwndDlg, UINT msg, WPARAM wParam
 			}

 			MarkChanges(4, hwndDlg);

 			break;

+

 		case IDC_SHOWNOTIFY:

 			EnableWindow(GetDlgItem(hwndDlg, IDC_TYPEWIN), IsDlgButtonChecked(hwndDlg, IDC_SHOWNOTIFY));

 			EnableWindow(GetDlgItem(hwndDlg, IDC_TYPETRAY), IsDlgButtonChecked(hwndDlg, IDC_SHOWNOTIFY));

 			EnableWindow(GetDlgItem(hwndDlg, IDC_NOTIFYTRAY), IsDlgButtonChecked(hwndDlg, IDC_SHOWNOTIFY));

 			EnableWindow(GetDlgItem(hwndDlg, IDC_NOTIFYBALLOON), IsDlgButtonChecked(hwndDlg, IDC_SHOWNOTIFY));

-			//fall-thru

+

+		// fall-thru

 		case IDC_TYPEWIN:

 		case IDC_NOTIFYTRAY:

 		case IDC_NOTIFYBALLOON:

@@ -916,6 +913,7 @@ static INT_PTR CALLBACK DlgProcTypeOptions(HWND hwndDlg, UINT msg, WPARAM wParam
 			break;

 		}

 		break;

+	

 	case WM_NOTIFY:

 		switch (((NMHDR *)lParam)->idFrom) {

 		case IDC_CLIST:

@@ -931,6 +929,7 @@ static INT_PTR CALLBACK DlgProcTypeOptions(HWND hwndDlg, UINT msg, WPARAM wParam
 				break;

 			}

 			break;

+		

 		case 0:

 			switch (((LPNMHDR)lParam)->code) {

 			case PSN_APPLY: