- resizer moved to mir_core, because it uses hard-coded windows structures;

- MS_UTILS_RESIZEDIALOG replaced with a short call of Utils_ResizeDialog;
- code cleaning

git-svn-id: http://svn.miranda-ng.org/main/trunk@14295 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

3 files changed, 78 insertions, 111 deletions

diff --git a/plugins/DbEditorPP/src/findwindow.cpp b/plugins/DbEditorPP/src/findwindow.cpp
index 496d78fe81..92144dcb05 100644
--- a/plugins/DbEditorPP/src/findwindow.cpp
+++ b/plugins/DbEditorPP/src/findwindow.cpp
@@ -154,24 +154,16 @@ INT_PTR CALLBACK FindWindowDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
 		}

 		break;

 	case WM_GETMINMAXINFO:

-	{

-		MINMAXINFO *mmi = (MINMAXINFO*)lParam;

-		mmi->ptMinTrackSize.x = 610;

-		mmi->ptMinTrackSize.y = 300;

-	}

-	return 0;

+		{

+			MINMAXINFO *mmi = (MINMAXINFO*)lParam;

+			mmi->ptMinTrackSize.x = 610;

+			mmi->ptMinTrackSize.y = 300;

+		}

+		return 0;

+

 	case WM_SIZE:

-	{

-		UTILRESIZEDIALOG urd;

-		memset(&urd, 0, sizeof(urd));

-		urd.cbSize = sizeof(urd);

-		urd.hInstance = hInst;

-		urd.hwndDlg = hwnd;

-		urd.lpTemplate = MAKEINTRESOURCEA(IDD_FIND);

-		urd.pfnResizer = FindDialogResize;

-		CallService(MS_UTILS_RESIZEDIALOG, 0, (LPARAM)&urd);

-	}

-	break;

+		Utils_ResizeDialog(hwnd, hInst, MAKEINTRESOURCEA(IDD_FIND), FindDialogResize);

+		break;

 

 	case WM_NOTIFY:

 		if (LOWORD(wParam) != IDC_LIST) break;

diff --git a/plugins/DbEditorPP/src/main_window.cpp b/plugins/DbEditorPP/src/main_window.cpp
index 74723eb983..f8f3826db9 100644
--- a/plugins/DbEditorPP/src/main_window.cpp
+++ b/plugins/DbEditorPP/src/main_window.cpp
@@ -263,54 +263,43 @@ INT_PTR CALLBACK MainDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 		return TRUE;

 

 	case GC_SPLITTERMOVED:

-	{

-		int splitterPos = GetWindowLongPtr(GetDlgItem(hwnd, IDC_SPLITTER), GWLP_USERDATA);

-

-		RECT rc2;

-		GetWindowRect(hwnd, &rc2);

-

-		if ((HWND)lParam == GetDlgItem(hwnd, IDC_SPLITTER)) {

-			RECT rc;

-			GetClientRect(hwnd, &rc);

-			POINT pt = { wParam, 0 };

-			ScreenToClient(hwnd, &pt);

-

-			splitterPos = rc.left + pt.x + 1;

-			if (splitterPos < 150)

-				splitterPos = 150;

-			if (splitterPos > rc2.right - rc2.left - 150)

-				splitterPos = rc2.right - rc2.left - 150;

-			SetWindowLongPtr(GetDlgItem(hwnd, IDC_SPLITTER), GWLP_USERDATA, splitterPos);

-			db_set_w(NULL, modname, "Splitter", (WORD)splitterPos);

+		{

+			int splitterPos = GetWindowLongPtr(GetDlgItem(hwnd, IDC_SPLITTER), GWLP_USERDATA);

+

+			RECT rc2;

+			GetWindowRect(hwnd, &rc2);

+

+			if ((HWND)lParam == GetDlgItem(hwnd, IDC_SPLITTER)) {

+				RECT rc;

+				GetClientRect(hwnd, &rc);

+				POINT pt = { wParam, 0 };

+				ScreenToClient(hwnd, &pt);

+

+				splitterPos = rc.left + pt.x + 1;

+				if (splitterPos < 150)

+					splitterPos = 150;

+				if (splitterPos > rc2.right - rc2.left - 150)

+					splitterPos = rc2.right - rc2.left - 150;

+				SetWindowLongPtr(GetDlgItem(hwnd, IDC_SPLITTER), GWLP_USERDATA, splitterPos);

+				db_set_w(NULL, modname, "Splitter", (WORD)splitterPos);

+			}

+			PostMessage(hwnd, WM_SIZE, 0, 0);

 		}

-		PostMessage(hwnd, WM_SIZE, 0, 0);

-	}

-	break;

+		break;

 

 	case WM_GETMINMAXINFO:

-	{

-		MINMAXINFO *mmi = (MINMAXINFO *)lParam;

-		int splitterPos = GetWindowLongPtr(GetDlgItem(hwnd, IDC_SPLITTER), GWLP_USERDATA);

-		mmi->ptMinTrackSize.x = splitterPos + 150;

-		mmi->ptMinTrackSize.y = 300;

-	}

-	return 0;

+		{

+			MINMAXINFO *mmi = (MINMAXINFO *)lParam;

+			int splitterPos = GetWindowLongPtr(GetDlgItem(hwnd, IDC_SPLITTER), GWLP_USERDATA);

+			mmi->ptMinTrackSize.x = splitterPos + 150;

+			mmi->ptMinTrackSize.y = 300;

+		}

+		return 0;

 

 	case WM_MOVE:

 	case WM_SIZE:

-	{

-		UTILRESIZEDIALOG urd;

-

-		memset(&urd, 0, sizeof(urd));

-		urd.cbSize = sizeof(urd);

-		urd.hInstance = hInst;

-		urd.hwndDlg = hwnd;

-		urd.lParam = (LPARAM)GetWindowLongPtr(GetDlgItem(hwnd, IDC_SPLITTER), GWLP_USERDATA);

-		urd.lpTemplate = MAKEINTRESOURCEA(IDD_MAIN);

-		urd.pfnResizer = DialogResize;

-		CallService(MS_UTILS_RESIZEDIALOG, 0, (LPARAM)&urd);

-	}

-	break;

+		Utils_ResizeDialog(hwnd, hInst, MAKEINTRESOURCEA(IDD_MAIN), DialogResize, GetWindowLongPtr(GetDlgItem(hwnd, IDC_SPLITTER), GWLP_USERDATA));

+		break;

 

 	case WM_DESTROY: // free our shit!

 		if (db_get_b(NULL, modname, "RestoreOnOpen", 1)) {

@@ -402,7 +391,6 @@ INT_PTR CALLBACK MainDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 			break;

 

 		case MENU_REFRESH_SETS:

-		{

 			TVITEM tvi;

 

 			TCHAR text[FLD_SIZE];

@@ -410,14 +398,15 @@ INT_PTR CALLBACK MainDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 			tvi.hItem = TreeView_GetSelection(hwnd2Tree);

 			tvi.pszText = text; // modulename

 			tvi.cchTextMax = _countof(text);

-			if (!TreeView_GetItem(hwnd2Tree, &tvi)) break;

-			ModuleTreeInfoStruct *mtis = (ModuleTreeInfoStruct *)tvi.lParam;

-			if (mtis && (mtis->type == MODULE))

-				PopulateSettings(mtis->hContact, _T2A(text));

-			else

-				ClearListView();

-		}

-		break;

+			if (TreeView_GetItem(hwnd2Tree, &tvi)) {

+				ModuleTreeInfoStruct *mtis = (ModuleTreeInfoStruct *)tvi.lParam;

+				if (mtis && (mtis->type == MODULE))

+					PopulateSettings(mtis->hContact, _T2A(text));

+				else

+					ClearListView();

+			}

+			break;

+

 		///////////////////////// // watches

 		case MENU_VIEW_WATCHES:

 			openWatchedVarWindow();

diff --git a/plugins/DbEditorPP/src/watchedvars.cpp b/plugins/DbEditorPP/src/watchedvars.cpp
index a43c1e46c3..0fa41b0532 100644
--- a/plugins/DbEditorPP/src/watchedvars.cpp
+++ b/plugins/DbEditorPP/src/watchedvars.cpp
@@ -238,18 +238,16 @@ LRESULT CALLBACK WatchSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
 

 INT_PTR CALLBACK WatchDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)

 {

-	switch (msg)

-	{

+	switch (msg) {

 	case WM_INITDIALOG:

-	{

-	    hwnd2watchedVarsWindow = hwnd;

+		hwnd2watchedVarsWindow = hwnd;

 		// do the icon

 		SendMessage(hwnd, WM_SETICON, ICON_BIG, (LPARAM)LoadIcon(hInst, MAKEINTRESOURCE(ICO_REGEDIT)));

 		TranslateMenu(GetMenu(hwnd));

 		TranslateMenu(GetSubMenu(GetMenu(hwnd), 0));

 		TranslateDialogDefault(hwnd);

-	

-	    SetWindowLong(hwnd, GWL_EXSTYLE, GetWindowLong(hwnd, GWL_EXSTYLE) | WS_EX_APPWINDOW); // taskbar icon

+

+		SetWindowLong(hwnd, GWL_EXSTYLE, GetWindowLong(hwnd, GWL_EXSTYLE) | WS_EX_APPWINDOW); // taskbar icon

 

 		ListView_SetExtendedListViewStyle(GetDlgItem(hwnd, IDC_VARS), 32 | LVS_EX_LABELTIP); // LVS_EX_GRIDLINES

 

@@ -259,33 +257,23 @@ INT_PTR CALLBACK WatchDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 		mir_subclassWindow(GetDlgItem(hwnd, IDC_VARS), WatchSubclassProc);

 

 		PopulateWatchedWindow();

-	}

-	return TRUE;

+		return TRUE;

+

 	// for the resize

 	case WM_GETMINMAXINFO:

-	{

-		MINMAXINFO *mmi = (MINMAXINFO*)lParam;

-		mmi->ptMinTrackSize.x = 500;

-		mmi->ptMinTrackSize.y = 300;

+		{

+			MINMAXINFO *mmi = (MINMAXINFO*)lParam;

+			mmi->ptMinTrackSize.x = 500;

+			mmi->ptMinTrackSize.y = 300;

+		}

 		return 0;

-	}

+

 	case WM_SIZE:

-	{

-		UTILRESIZEDIALOG urd;

-		memset(&urd, 0, sizeof(urd));

-		urd.cbSize = sizeof(urd);

-		urd.hInstance = hInst;

-		urd.hwndDlg = hwnd;

-		urd.lParam = 0;

-		urd.lpTemplate = MAKEINTRESOURCEA(IDD_WATCH_DIAG);

-		urd.pfnResizer = WatchDialogResize;

-		CallService(MS_UTILS_RESIZEDIALOG, 0, (LPARAM)&urd);

+		Utils_ResizeDialog(hwnd, hInst, MAKEINTRESOURCEA(IDD_WATCH_DIAG), WatchDialogResize);

 		break;

-	}

 

 	case WM_COMMAND:

-		switch (LOWORD(wParam))

-		{

+		switch (LOWORD(wParam)) {

 		case MENU_REMALL_WATCHES:

 			freeAllWatches();

 			break;

@@ -300,14 +288,13 @@ INT_PTR CALLBACK WatchDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 		break;

 

 	case WM_NOTIFY:

-		switch (LOWORD(wParam))

-		{

+		switch (LOWORD(wParam)) {

 		case IDC_VARS:

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

 			case NM_DBLCLK:

+				LVHITTESTINFO hti;

+				LVITEM lvi;

 				{

-					LVHITTESTINFO hti;

-					LVITEM lvi;

 					HWND hwndVars = GetDlgItem(hwnd, IDC_VARS);

 					hti.pt = ((NMLISTVIEW*)lParam)->ptAction;

 					if (ListView_SubItemHitTest(hwndVars, &hti) > -1)

@@ -330,21 +317,21 @@ INT_PTR CALLBACK WatchDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 					}

 				}

 				break;

+

 			case LVN_COLUMNCLICK:

-				{

-					LPNMLISTVIEW lv = (LPNMLISTVIEW)lParam;

-					ColumnsSortParams params;

-					params.hList = GetDlgItem(hwnd, IDC_VARS);

-					params.column = lv->iSubItem;

-					params.last = lastColumn;

-					ListView_SortItemsEx(params.hList, ColumnsCompare, (LPARAM)&params);

-					lastColumn = (params.column == lastColumn) ? -1 : params.column;

-					break;

-				}

+				LPNMLISTVIEW lv = (LPNMLISTVIEW)lParam;

+				ColumnsSortParams params;

+				params.hList = GetDlgItem(hwnd, IDC_VARS);

+				params.column = lv->iSubItem;

+				params.last = lastColumn;

+				ListView_SortItemsEx(params.hList, ColumnsCompare, (LPARAM)&params);

+				lastColumn = (params.column == lastColumn) ? -1 : params.column;

+				break;

 			}

 			break;

 		}

 		break;

+

 	case WM_DESTROY:

 		ListView_DeleteAllItems(GetDlgItem(hwnd, IDC_VARS));

 		saveListSettings(GetDlgItem(hwnd, IDC_VARS), csWatchList);

@@ -355,9 +342,8 @@ INT_PTR CALLBACK WatchDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 	return 0;

 }

 

-

-void openWatchedVarWindow() {

-

+void openWatchedVarWindow()

+{

 	if (!hwnd2watchedVarsWindow) 

 		CreateDialog(hInst, MAKEINTRESOURCE(IDD_WATCH_DIAG), NULL, WatchDlgProc);

 	else