From 3f00912895ae0820b4db9ae7081f5ffcba1b074c Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sat, 26 Jul 2014 18:39:48 +0000
Subject: stupid duplicated code of embedded clists removed

git-svn-id: http://svn.miranda-ng.org/main/trunk@9953 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/modules/clist/clc.h        |  1 -
 src/modules/clist/clcutils.cpp | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

(limited to 'src/modules/clist')

diff --git a/src/modules/clist/clc.h b/src/modules/clist/clc.h
index ba8bee42d2..35c3a4b004 100644
--- a/src/modules/clist/clc.h
+++ b/src/modules/clist/clc.h
@@ -106,7 +106,6 @@ int fnRowHitTest(struct ClcData *dat, int y);
 
 /* clcopts.c */
 int ClcOptInit(WPARAM wParam, LPARAM lParam);
-DWORD GetDefaultExStyle(void);
 void GetFontSetting(int i, LOGFONTA *lf, COLORREF *colour);
 
 /* clistmenus.c */
diff --git a/src/modules/clist/clcutils.cpp b/src/modules/clist/clcutils.cpp
index 87222c1ce1..50c2e45b0b 100644
--- a/src/modules/clist/clcutils.cpp
+++ b/src/modules/clist/clcutils.cpp
@@ -737,6 +737,22 @@ void fnLoadClcOptions(HWND hwnd, struct ClcData *dat, BOOL bFirst)
 	dat->quickSearchColour = db_get_dw(NULL, "CLC", "QuickSearchColour", CLCDEFAULT_QUICKSEARCHCOLOUR);
 	dat->useWindowsColours = db_get_b(NULL, "CLC", "UseWinColours", CLCDEFAULT_USEWINDOWSCOLOURS);
 
+	if (cli.hwndContactTree != NULL && hwnd != cli.hwndContactTree) {
+		dat->bkChanged = true; // block custom background
+		dat->bkColour = GetSysColor(COLOR_WINDOW);
+		if (dat->hBmpBackground) {
+			DeleteObject(dat->hBmpBackground);
+			dat->hBmpBackground = NULL;
+		}
+
+		dat->greyoutFlags = 0;
+		dat->leftMargin = 4;
+		dat->groupIndent = 10;
+
+		for (int i=0; i <= FONTID_MAX; i++)
+			dat->fontInfo[i].colour = GetSysColor(COLOR_WINDOWTEXT);
+	}
+
 	if (!dat->bkChanged) {
 		dat->bkColour = db_get_dw(NULL, "CLC", "BkColour", CLCDEFAULT_BKCOLOUR);
 		if (dat->hBmpBackground) {
-- 
cgit v1.2.3