From 3a445410b69f9ee90b5a990237012ae71e35aaca Mon Sep 17 00:00:00 2001 From: slotwin Date: Mon, 12 May 2014 14:49:56 +0000 Subject: fix for clist_modern toptoolbar toggle buttons git-svn-id: http://svn.miranda-ng.org/main/trunk@9175 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Clist_modern/src/modern_tbbutton.cpp | 9 +++++++++ plugins/Clist_modern/src/modern_toolbar.cpp | 2 -- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'plugins/Clist_modern') diff --git a/plugins/Clist_modern/src/modern_tbbutton.cpp b/plugins/Clist_modern/src/modern_tbbutton.cpp index d22cf76aab..2825a8259d 100644 --- a/plugins/Clist_modern/src/modern_tbbutton.cpp +++ b/plugins/Clist_modern/src/modern_tbbutton.cpp @@ -289,6 +289,15 @@ static LRESULT CALLBACK ToolbarButtonProc(HWND hwndDlg, UINT msg, WPARAM wParam } break; + case WM_MOUSELEAVE: + case BUTTONSETASPUSHBTN: + return 0; + + case WM_ENABLE: // windows tells us to enable/disable + bct->stateId = wParam ? PBS_NORMAL : PBS_DISABLED; + InvalidateParentRect(bct->hwnd, NULL, TRUE); + return 0; + case WM_LBUTTONDOWN: { POINT ptMouse = UNPACK_POINT(lParam); diff --git a/plugins/Clist_modern/src/modern_toolbar.cpp b/plugins/Clist_modern/src/modern_toolbar.cpp index 787a6c06a7..b6b6c3a38b 100644 --- a/plugins/Clist_modern/src/modern_toolbar.cpp +++ b/plugins/Clist_modern/src/modern_toolbar.cpp @@ -76,8 +76,6 @@ void Modern_InitButtons() else tbb.hIconHandleUp = RegisterIcolibIconHandle(buf, "Toolbar", BTNS[i].pszTooltipUp, NULL, 0, NULL, SKINICON_OTHER_MAINMENU); if (BTNS[i].pszTooltipDn) { - tbb.dwFlags |= TTBBF_ASPUSHBUTTON; - mir_snprintf(buf,SIZEOF(buf),"%s%s%s", TTB_OPTDIR, BTNS[i].pszButtonID, "_up"); tbb.hIconHandleDn = RegisterIcolibIconHandle(buf, "Toolbar", BTNS[i].pszTooltipDn, _T("icons\\toolbar_icons.dll"), BTNS[i].icoDefIdx+1, g_hInst, BTNS[i].defResource2 ); } -- cgit v1.2.3