diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-07-26 17:02:28 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-07-26 17:02:28 +0000 |
| commit | e52c300401ddd8188a9fb9db307e369428cbeb19 (patch) | |
| tree | 3e0b77f5a73dfd3b4ca9cfbb85701d847b0dee76 /plugins/Clist_modern | |
| parent | 0aa96e0a23064eb3d2a041c2acebd30855d5245e (diff) | |
- 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
Diffstat (limited to 'plugins/Clist_modern')
| -rw-r--r-- | plugins/Clist_modern/src/modern_clc.cpp | 2 | ||||
| -rw-r--r-- | plugins/Clist_modern/src/modern_clcpaint.cpp | 2 | ||||
| -rw-r--r-- | plugins/Clist_modern/src/modern_clcutils.cpp | 12 |
3 files changed, 3 insertions, 13 deletions
diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp index f131f67697..bd733b3001 100644 --- a/plugins/Clist_modern/src/modern_clc.cpp +++ b/plugins/Clist_modern/src/modern_clc.cpp @@ -1410,7 +1410,7 @@ static LRESULT clcOnDestroy(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LP DeleteObject(dat->hMenuBackground);
dat->hMenuBackground = NULL;
}
- if (!dat->bkChanged && dat->hBmpBackground) {
+ if (dat->hBmpBackground) {
DeleteObject(dat->hBmpBackground);
dat->hBmpBackground = NULL;
}
diff --git a/plugins/Clist_modern/src/modern_clcpaint.cpp b/plugins/Clist_modern/src/modern_clcpaint.cpp index 14c565bb3e..168ef2b9fa 100644 --- a/plugins/Clist_modern/src/modern_clcpaint.cpp +++ b/plugins/Clist_modern/src/modern_clcpaint.cpp @@ -1902,9 +1902,7 @@ void CLCPaint::_DrawLines( HWND hWnd, ClcData *dat, HDC hdc, int paintMode, RECT if ( paintMode&DM_GREYALTERNATE && line_num&1 )
{
if ( paintMode&DM_CONTROL || dat->bkChanged )
- {
FillRect( pc.hdcMem, &row_rc, pc.hBrushAlternateGrey );
- }
else
SkinDrawGlyph( pc.hdcMem, &row_rc, rcPaint, "CL,ID=GreyAlternate");
}
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)
|