From e52c300401ddd8188a9fb9db307e369428cbeb19 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 26 Jul 2014 17:02:28 +0000 Subject: - unified bkChanged processing; - clist background bitmap processing also moved to the core git-svn-id: http://svn.miranda-ng.org/main/trunk@9950 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Clist_modern/src/modern_clcutils.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'plugins/Clist_modern/src/modern_clcutils.cpp') diff --git a/plugins/Clist_modern/src/modern_clcutils.cpp b/plugins/Clist_modern/src/modern_clcutils.cpp index 4d9ce604f9..ac4894f5dc 100644 --- a/plugins/Clist_modern/src/modern_clcutils.cpp +++ b/plugins/Clist_modern/src/modern_clcutils.cpp @@ -665,16 +665,6 @@ void LoadCLCOptions(HWND hwnd, ClcData *dat, BOOL bFirst) if (dat->hMenuBackground) { DeleteObject(dat->hMenuBackground); dat->hMenuBackground = NULL; } if (g_CluiData.fDisableSkinEngine) { - if (!dat->bkChanged) { - dat->bkColour = sttGetColor("CLC", "BkColour", GetSysColor(COLOR_3DFACE)); - - if (db_get_b(NULL, "CLC", "UseBitmap", CLCDEFAULT_USEBITMAP)) { - ptrA szBitmap(db_get_sa(NULL, "CLC", "BkBitmap")); - if (szBitmap) - dat->hBmpBackground = (HBITMAP)CallService(MS_UTILS_LOADBITMAP, 0, szBitmap); - } - dat->backgroundBmpUse = db_get_w(NULL, "CLC", "BkBmpUse", CLCDEFAULT_BKBMPUSE); - } dat->MenuBkColor = sttGetColor("Menu", "BkColour", CLCDEFAULT_BKCOLOUR); dat->MenuBkHiColor = sttGetColor("Menu", "SelBkColour", CLCDEFAULT_SELBKCOLOUR); @@ -709,6 +699,8 @@ void LoadCLCOptions(HWND hwnd, ClcData *dat, BOOL bFirst) IvalidateDisplayNameCache(16); corecli.pfnLoadClcOptions(hwnd, dat, bFirst); + + dat->useWindowsColours = false; // because it's missing in the options } int ExpandMetaContact(HWND hwnd, ClcContact *contact, ClcData *dat, BOOL bExpand) -- cgit v1.2.3