- view modes support incorporated into the CLIST_INTERFACE;

- fix for the broken search by protocols in clist_nicer;
- numerous Unicode fixes in clist_nicer;

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

1 files changed, 31 insertions, 31 deletions

diff --git a/plugins/Clist_modern/src/modern_toolbar.cpp b/plugins/Clist_modern/src/modern_toolbar.cpp
index a17eb50726..52c2b1fcc5 100644
--- a/plugins/Clist_modern/src/modern_toolbar.cpp
+++ b/plugins/Clist_modern/src/modern_toolbar.cpp
@@ -216,19 +216,19 @@ static LRESULT CALLBACK toolbarWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA
 

 	case WM_NCPAINT:

 	case WM_PAINT:

-	{

-		PAINTSTRUCT ps;

-		BOOL bFloat = (GetParent(hwnd) != pcli->hwndContactList);

-		if (g_CluiData.fDisableSkinEngine || !g_CluiData.fLayered || bFloat) {

-			BeginPaint(hwnd, &ps);

-			if ((!g_CluiData.fLayered || bFloat) && !g_CluiData.fDisableSkinEngine)

-				sttDrawNonLayeredSkinedBar(hwnd, ps.hdc);

-			else

-				sttDrawToolBarBackground(hwnd, ps.hdc, &ps.rcPaint, pMTBInfo);

-			EndPaint(hwnd, &ps);

+		{

+			PAINTSTRUCT ps;

+			BOOL bFloat = (GetParent(hwnd) != pcli->hwndContactList);

+			if (g_CluiData.fDisableSkinEngine || !g_CluiData.fLayered || bFloat) {

+				BeginPaint(hwnd, &ps);

+				if ((!g_CluiData.fLayered || bFloat) && !g_CluiData.fDisableSkinEngine)

+					sttDrawNonLayeredSkinedBar(hwnd, ps.hdc);

+				else

+					sttDrawToolBarBackground(hwnd, ps.hdc, &ps.rcPaint, pMTBInfo);

+				EndPaint(hwnd, &ps);

+			}

 		}

-	}

-	return DefWindowProc(hwnd, msg, wParam, lParam);

+		return DefWindowProc(hwnd, msg, wParam, lParam);

 

 	case WM_NOTIFY:

 		if (((LPNMHDR)lParam)->code == BUTTONNEEDREDRAW)

@@ -236,26 +236,26 @@ static LRESULT CALLBACK toolbarWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA
 		return 0;

 

 	case MTBM_LAYEREDPAINT:

-	{

-		RECT MyRect = { 0 };

-		HDC hDC = (HDC)wParam;

-		GetWindowRect(hwnd, &MyRect);

-

-		RECT rcClient;

-		GetClientRect(hwnd, &rcClient);

-		SkinDrawGlyph(hDC, &rcClient, &rcClient, "Bar,ID=ToolBar,Part=Background");

-

-		for (int i = 0; i < pMTBInfo->pButtonList->realCount; i++) {

-			RECT childRect;

-			POINT Offset;

-			TTBCtrlButton* mtbi = (TTBCtrlButton*)pMTBInfo->pButtonList->items[i];

-			GetWindowRect(mtbi->hWindow, &childRect);

-			Offset.x = childRect.left - MyRect.left;

-			Offset.y = childRect.top - MyRect.top;

-			SendMessage(mtbi->hWindow, BUTTONDRAWINPARENT, (WPARAM)hDC, (LPARAM)&Offset);

+		{

+			RECT MyRect = { 0 };

+			HDC hDC = (HDC)wParam;

+			GetWindowRect(hwnd, &MyRect);

+

+			RECT rcClient;

+			GetClientRect(hwnd, &rcClient);

+			SkinDrawGlyph(hDC, &rcClient, &rcClient, "Bar,ID=ToolBar,Part=Background");

+

+			for (int i = 0; i < pMTBInfo->pButtonList->realCount; i++) {

+				RECT childRect;

+				POINT Offset;

+				TTBCtrlButton* mtbi = (TTBCtrlButton*)pMTBInfo->pButtonList->items[i];

+				GetWindowRect(mtbi->hWindow, &childRect);

+				Offset.x = childRect.left - MyRect.left;

+				Offset.y = childRect.top - MyRect.top;

+				SendMessage(mtbi->hWindow, BUTTONDRAWINPARENT, (WPARAM)hDC, (LPARAM)&Offset);

+			}

 		}

-	}

-	return 0;

+		return 0;

 

 	case WM_DESTROY:

 		xpt_FreeThemeForWindow(hwnd);