From 5c0dbfc4d2205e02fae8f59e17553c672794680b Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 4 Nov 2013 19:17:18 +0000 Subject: half-dead clist modern toolbar became 3/4 dead git-svn-id: http://svn.miranda-ng.org/main/trunk@6772 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Clist_modern/src/modern_toolbar.cpp | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) (limited to 'plugins') diff --git a/plugins/Clist_modern/src/modern_toolbar.cpp b/plugins/Clist_modern/src/modern_toolbar.cpp index 22fc101987..38f8c9ae4a 100644 --- a/plugins/Clist_modern/src/modern_toolbar.cpp +++ b/plugins/Clist_modern/src/modern_toolbar.cpp @@ -109,7 +109,7 @@ struct WORD mtb_backgroundBmpUse; BOOL mtb_useWinColors; } -static tbdat = { 0 }; +static tbdat = { NULL, CLCDEFAULT_BKCOLOUR, CLCDEFAULT_BKBMPUSE, CLCDEFAULT_USEWINDOWSCOLOURS }; COLORREF sttGetColor(char * module, char * color, COLORREF defColor); @@ -133,28 +133,6 @@ static int ehhToolBarSettingsChanged(WPARAM wParam, LPARAM lParam) return 0; } -static int ehhToolBarBackgroundSettingsChanged(WPARAM wParam, LPARAM lParam) -{ - if ( tbdat.mtb_hBmpBackground) { - DeleteObject(tbdat.mtb_hBmpBackground); - tbdat.mtb_hBmpBackground = NULL; - } - if (g_CluiData.fDisableSkinEngine) { - DBVARIANT dbv; - tbdat.mtb_bkColour = sttGetColor("ToolBar","BkColour",CLCDEFAULT_BKCOLOUR); - if ( db_get_b(NULL,"ToolBar","UseBitmap",CLCDEFAULT_USEBITMAP)) { - if ( !db_get_s(NULL, "ToolBar", "BkBitmap", &dbv, DBVT_TCHAR)) { - tbdat.mtb_hBmpBackground = (HBITMAP)CallService(MS_UTILS_LOADBITMAP, 0, (LPARAM)dbv.ptszVal); - db_free(&dbv); - } - } - tbdat.mtb_useWinColors = db_get_b(NULL, "ToolBar", "UseWinColours", CLCDEFAULT_USEWINDOWSCOLOURS); - tbdat.mtb_backgroundBmpUse = db_get_b(NULL, "ToolBar", "BkBmpUse", CLCDEFAULT_BKBMPUSE); - } - PostMessage(pcli->hwndContactList,WM_SIZE, 0, 0); - return 0; -} - static BOOL sttDrawToolBarBackground(HWND hwnd, HDC hdc, RECT *rect, ModernToolbarCtrl* pMTBInfo) { BOOL bFloat = (GetParent(hwnd)!=pcli->hwndContactList); @@ -328,7 +306,6 @@ static int Toolbar_ModulesLoaded(WPARAM, LPARAM) CallService(MS_BACKGROUNDCONFIG_REGISTER, (WPARAM)"ToolBar Background/ToolBar",0); HookEvent(ME_DB_CONTACT_SETTINGCHANGED, ehhToolBarSettingsChanged); - HookEvent(ME_BACKGROUNDCONFIG_CHANGED, ehhToolBarBackgroundSettingsChanged); TopToolbar_SetCustomProc(CustomizeButton, 0); @@ -359,8 +336,6 @@ static int Toolbar_ModulesLoaded(WPARAM, LPARAM) HRESULT ToolbarLoadModule() { - ehhToolBarBackgroundSettingsChanged(0, 0); - HookEvent(ME_SYSTEM_MODULELOAD, Toolbar_ModuleReloaded); HookEvent(ME_SYSTEM_MODULESLOADED, Toolbar_ModulesLoaded); return S_OK; -- cgit v1.2.3