slightly changed design of custom MButtonCtrl window procedure. Clist Nicer works ok

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

2 files changed, 18 insertions, 4 deletions

diff --git a/plugins/Clist_modern/modern_tbbutton.cpp b/plugins/Clist_modern/modern_tbbutton.cpp
index dadf53637a..d9d95e7969 100644
--- a/plugins/Clist_modern/modern_tbbutton.cpp
+++ b/plugins/Clist_modern/modern_tbbutton.cpp
@@ -267,17 +267,17 @@ static LRESULT CALLBACK ToolbarButtonProc(HWND hwndDlg, UINT  msg, WPARAM wParam
 			RECT nillRect = {0};

 			lpSBData->rcMargins = nillRect;

 		}

-		return 0;

+		break;

 

 	case BUTTONSETID:

 		lstrcpynA(lpSBData->szButtonID, (char *)lParam, SIZEOF(lpSBData->szButtonID)-1);

 		lpSBData->szButtonID[SIZEOF(lpSBData->szButtonID)-1] = '\0';

-		return 0;

+		break;

 

 	case BUTTONDRAWINPARENT:

 		if (IsWindowVisible(hwndDlg))

 			PaintWorker(lpSBData, (HDC) wParam, (POINT*) lParam);

-		return 0;

+		break;

 

 	case WM_NCPAINT:

 	case WM_PAINT:

@@ -290,6 +290,7 @@ static LRESULT CALLBACK ToolbarButtonProc(HWND hwndDlg, UINT  msg, WPARAM wParam
 			}

 		}

 		ValidateRect(hwndDlg,NULL);

+		lpSBData->lResult = 0;

 		return 1;

 

 	case WM_CAPTURECHANGED:

diff --git a/plugins/Clist_modern/modern_toolbar.cpp b/plugins/Clist_modern/modern_toolbar.cpp
index 606dc1122a..89de2e2609 100644
--- a/plugins/Clist_modern/modern_toolbar.cpp
+++ b/plugins/Clist_modern/modern_toolbar.cpp
@@ -35,6 +35,7 @@ struct
 	char *pszTooltipUp, *pszTooltipDn;

 	int icoDefIdx, defResource, defResource2;

 	BOOL bVisByDefault;

+	HANDLE hButton;

 }

 static BTNS[] = 

 {

@@ -74,8 +75,13 @@ static int Modern_InitButtons(WPARAM, LPARAM)
 		else tbb.dwFlags |= TTBBF_ISSEPARATOR;

 

 		tbb.dwFlags |= (BTNS[i].bVisByDefault ? TTBBF_VISIBLE :0 );

-		TopToolbar_AddButton(&tbb);

+		BTNS[i].hButton = TopToolbar_AddButton(&tbb);

 	}

+

+	CallService(MS_TTB_SETBUTTONSTATE, (WPARAM)BTNS[3].hButton, db_get_b(NULL, "CList", "HideOffline", SETTING_HIDEOFFLINE_DEFAULT) ? TTBST_PUSHED : TTBST_RELEASED);

+	CallService(MS_TTB_SETBUTTONSTATE, (WPARAM)BTNS[6].hButton, db_get_b(NULL, "CList", "UseGroups", SETTING_USEGROUPS_DEFAULT) ? TTBST_PUSHED : TTBST_RELEASED);

+	CallService(MS_TTB_SETBUTTONSTATE, (WPARAM)BTNS[7].hButton, db_get_b(NULL, "Skin", "UseSound", SETTING_ENABLESOUNDS_DEFAULT) ? TTBST_PUSHED : TTBST_RELEASED);

+

 	return 1;

 }

 

@@ -241,11 +247,18 @@ static LRESULT CALLBACK toolbarWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA
 	return 0;

 }

 

+static int ToolBar_LayeredPaintProc(HWND hWnd, HDC hDC, RECT *rcPaint, HRGN rgn, DWORD dFlags, void * CallBackData)

+{

+	return SendMessage(hWnd, MTBM_LAYEREDPAINT,(WPARAM)hDC,0);

+}

+

 void CustomizeToolbar(HWND hwnd)

 {

 	TTBCtrlCustomize custData = { sizeof(ModernToolbarCtrl), toolbarWndProc, NULL };

 	SendMessage(hwnd, TTB_SETCUSTOM, 0, (LPARAM)&custData);

 

+	CallService(MS_SKINENG_REGISTERPAINTSUB,(WPARAM)hwnd,(LPARAM)ToolBar_LayeredPaintProc);

+

 	ModernToolbarCtrl* pMTBInfo = (ModernToolbarCtrl*)GetWindowLongPtr(hwnd, 0);

 	pMTBInfo->nLineCount = 1;

 	pMTBInfo->mtbXPTheme = xpt_AddThemeHandle(hwnd, L"TOOLBAR");