massive extinction of clutches:

- nicer own extra icons;
- duplicate cache entries in modern
- many other quirks

git-svn-id: http://svn.miranda-ng.org/main/trunk@2201 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

8 files changed, 52 insertions, 138 deletions

diff --git a/plugins/Clist_modern/src/hdr/modern_clc.h b/plugins/Clist_modern/src/hdr/modern_clc.h
index 10be28480c..6c64663105 100644
--- a/plugins/Clist_modern/src/hdr/modern_clc.h
+++ b/plugins/Clist_modern/src/hdr/modern_clc.h
@@ -50,7 +50,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define HCONTACT_ISGROUP    0x80000000

 #define HCONTACT_ISINFO     0xFFFF0000

 

-#define MAXEXTRACOLUMNS     16

 #define MAXSTATUSMSGLEN		256

 

 #define INTM_NAMECHANGED     (WM_USER+10)

@@ -225,16 +224,14 @@ struct ClcContact : public ClcContactBase
 	RECT pos_label;

 	RECT pos_rename_rect;

 	RECT pos_contact_time;

-	RECT pos_extra[MAXEXTRACOLUMNS];

+	RECT pos_extra[EXTRA_ICON_COUNT];

 	DWORD lastPaintCounter;

 	BYTE bContactRate;

 

 	// For extended layout

 	BYTE ext_nItemsNum;

 	BOOL ext_fItemsValid;

-	tContactItems ext_mpItemsDesc[MAXEXTRACOLUMNS+10];  //up to 10 items

-

-	WORD iWideExtraImage[MAXEXTRACOLUMNS];

+	tContactItems ext_mpItemsDesc[EXTRA_ICON_COUNT+10];  //up to 10 items

 };

 

 struct ClcModernFontInfo {

@@ -355,8 +352,6 @@ struct ClcData : public ClcDataBase
 

 	XPTHANDLE hCheckBoxTheme;

 	BYTE bCompactMode;

-

-	HIMAGELIST himlWideExtraColumns;

 };

 

 struct SHORTDATA

diff --git a/plugins/Clist_modern/src/modern_cachefuncs.cpp b/plugins/Clist_modern/src/modern_cachefuncs.cpp
index 2c49634412..bb6b5b6c5d 100644
--- a/plugins/Clist_modern/src/modern_cachefuncs.cpp
+++ b/plugins/Clist_modern/src/modern_cachefuncs.cpp
@@ -556,7 +556,7 @@ void Cache_GetFirstLineText(struct ClcData *dat, ClcContact *contact)
 

 void Cache_GetSecondLineText(struct SHORTDATA *dat, PDNCE pdnce)

 {

-	TCHAR Text[240-MAXEXTRACOLUMNS] = {0};

+	TCHAR Text[240-EXTRA_ICON_COUNT] = {0};

 	int type = TEXT_EMPTY;

 

 	if (dat->second_line_show)	

@@ -585,7 +585,7 @@ void Cache_GetSecondLineText(struct SHORTDATA *dat, PDNCE pdnce)
 */

 void Cache_GetThirdLineText(struct SHORTDATA *dat, PDNCE pdnce)

 {

-	TCHAR Text[240-MAXEXTRACOLUMNS] = {0};

+	TCHAR Text[240-EXTRA_ICON_COUNT] = {0};

 	int type = TEXT_EMPTY;

 	if (dat->third_line_show)

 		type = Cache_GetLineText(pdnce, dat->third_line_type,(TCHAR*)Text, SIZEOF(Text), dat->third_line_text,

diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp
index 6ce417eef9..f0e5bc2891 100644
--- a/plugins/Clist_modern/src/modern_clc.cpp
+++ b/plugins/Clist_modern/src/modern_clc.cpp
@@ -1560,12 +1560,14 @@ static LRESULT clcOnLButtonUp(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM w
 	dat->iInsertionMark = -1;

 	return 0;

 }

+

 static LRESULT clcOnLButtonDblClick(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)

 {

 	KillTimer(hwnd,TIMERID_SUBEXPAND);

 	hitcontact = NULL;

 	return corecli.pfnContactListControlWndProc(hwnd, msg, wParam, lParam);

 }

+

 static LRESULT clcOnDestroy(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)

 {

 	int i=0;

@@ -1597,20 +1599,16 @@ static LRESULT clcOnDestroy(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wPa
 	xpt_FreeThemeForWindow(hwnd);

 	return 0;

 }

+

 static LRESULT clcOnIntmGroupChanged(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)

 {

 	ClcContact *contact;

-	BYTE iExtraImage[MAXEXTRACOLUMNS];

-	WORD iWideExtraImage[MAXEXTRACOLUMNS];

+	WORD iExtraImage[EXTRA_ICON_COUNT];

 	BYTE flags = 0;

-	if ( !pcli->pfnFindItem(hwnd, dat, (HANDLE) wParam, &contact, NULL, NULL))

-	{

-		memset(iExtraImage, 0xFF, SIZEOF(iExtraImage));

-		memset((void*)iWideExtraImage, 0xFF, sizeof(iWideExtraImage));

-	}

+	if ( !pcli->pfnFindItem(hwnd, dat, (HANDLE)wParam, &contact, NULL, NULL))

+		memset(iExtraImage, 0xFF, sizeof(iExtraImage));

 	else {

-		CopyMemory(iExtraImage, contact->iExtraImage, SIZEOF(iExtraImage));

-		CopyMemory((void*)iWideExtraImage, (void*)contact->iWideExtraImage, sizeof(iWideExtraImage));

+		memcpy(iExtraImage, contact->iExtraImage, sizeof(iExtraImage));

 		flags = contact->flags;

 	}

 	pcli->pfnDeleteItemFromTree(hwnd, (HANDLE) wParam);

@@ -1618,8 +1616,7 @@ static LRESULT clcOnIntmGroupChanged(struct ClcData *dat, HWND hwnd, UINT msg, W
 		NMCLISTCONTROL nm;

 		pcli->pfnAddContactToTree(hwnd, dat, (HANDLE) wParam, 1, 1);

 		if (pcli->pfnFindItem(hwnd, dat, (HANDLE) wParam, &contact, NULL, NULL)) {

-			CopyMemory(contact->iExtraImage, iExtraImage, SIZEOF(iExtraImage));

-			CopyMemory((void*)contact->iWideExtraImage, (void*)iWideExtraImage, sizeof(iWideExtraImage));

+			memcpy(contact->iExtraImage, iExtraImage, sizeof(iExtraImage));

 			if (flags & CONTACTF_CHECKED)

 				contact->flags |= CONTACTF_CHECKED;

 		}

diff --git a/plugins/Clist_modern/src/modern_clcitems.cpp b/plugins/Clist_modern/src/modern_clcitems.cpp
index c730ad66bb..48ff30bc2e 100644
--- a/plugins/Clist_modern/src/modern_clcitems.cpp
+++ b/plugins/Clist_modern/src/modern_clcitems.cpp
@@ -61,8 +61,7 @@ void AddSubcontacts(ClcData *dat, ClcContact *cont, BOOL showOfflineHereGroup)
 			Cache_GetAvatar(dat, &p);

 

 			p.iImage = CallService(MS_CLIST_GETCONTACTICON,(WPARAM)cacheEntry->hContact,1);

-			memset(p.iExtraImage,0xFF,sizeof(p.iExtraImage));

-			memset((void*)p.iWideExtraImage,0xFF,sizeof(p.iWideExtraImage));

+			memset(p.iExtraImage, 0xFF, sizeof(p.iExtraImage));

 			p.proto = cacheEntry->m_cache_cszProto;		

 			p.type = CLCIT_CONTACT;

 			p.flags = 0;//CONTACTF_ONLINE;

@@ -485,8 +484,7 @@ int GetNewSelection(ClcGroup *group, int selection, int direction)
 

 struct SavedContactState_t {

 	HANDLE hContact;

-	BYTE iExtraImage[MAXEXTRACOLUMNS];

-	WORD iWideExtraImage[MAXEXTRACOLUMNS];

+	WORD iExtraImage[EXTRA_ICON_COUNT];

 	int checked;

 };

 

@@ -540,12 +538,7 @@ void cli_SaveStateAndRebuildList(HWND hwnd, struct ClcData *dat)
 		else if (group->cl.items[group->scanIndex]->type == CLCIT_CONTACT) {

 			SavedContactState_t* p = new SavedContactState_t;

 			p->hContact = group->cl.items[group->scanIndex]->hContact;

-			CopyMemory(p->iExtraImage, group->cl.items[group->scanIndex]->iExtraImage,

-				sizeof(group->cl.items[group->scanIndex]->iExtraImage));

-			

-			CopyMemory((void*)p->iWideExtraImage, (void*)group->cl.items[group->scanIndex]->iWideExtraImage,

-				sizeof(group->cl.items[group->scanIndex]->iWideExtraImage));

-			

+			memcpy(p->iExtraImage, group->cl.items[group->scanIndex]->iExtraImage, sizeof(p->iExtraImage));

 			p->checked = group->cl.items[group->scanIndex]->flags & CONTACTF_CHECKED;

 			savedContact.insert( p );

 		}

@@ -586,12 +579,7 @@ void cli_SaveStateAndRebuildList(HWND hwnd, struct ClcData *dat)
 		else if (group->cl.items[group->scanIndex]->type == CLCIT_CONTACT) {

 			for (i=0; i < savedContact.getCount(); i++)

 				if (savedContact[i].hContact == group->cl.items[group->scanIndex]->hContact) {

-					CopyMemory(group->cl.items[group->scanIndex]->iExtraImage, savedContact[i].iExtraImage,

-						sizeof(group->cl.items[group->scanIndex]->iExtraImage));

-					

-					CopyMemory((void*)group->cl.items[group->scanIndex]->iWideExtraImage, (void*)savedContact[i].iWideExtraImage,

-						sizeof(group->cl.items[group->scanIndex]->iWideExtraImage));

-					

+					memcpy(group->cl.items[group->scanIndex]->iExtraImage, savedContact[i].iExtraImage, sizeof(contact->iExtraImage));

 					if (savedContact[i].checked)

 						group->cl.items[group->scanIndex]->flags |= CONTACTF_CHECKED;

 					break;

@@ -632,26 +620,19 @@ WORD pdnce___GetStatus(pClcCacheEntry pdnce)
 		return ID_STATUS_OFFLINE;

 	else

 		return pdnce->m_cache_nStatus;

-	/*

-	// this stub will replace direct usage of m_cache_nStatus and will be substituted by getting info from DB directrly

-	if ( !pdnce) return ID_STATUS_OFFLINE;

-	if ( !pdnce->m_cache_cszProto) return ID_STATUS_OFFLINE;

-	if ( !pdnce->hContact) return ID_STATUS_OFFLINE;

-	return DBGetContactSettingWord( pdnce->hContact, pdnce->m_cache_cszProto, "Status" , ID_STATUS_OFFLINE );

-	*/

 }

 

-

 void pdnce___SetStatus( pClcCacheEntry pdnce, WORD wStatus )

 {

-	if (pdnce) pdnce->m_cache_nStatus = wStatus;

+	if (pdnce)

+		pdnce->m_cache_nStatus = wStatus;

 }

 

 ClcContact* cliCreateClcContact()

 {

-	 ClcContact* contact = (ClcContact*)mir_calloc(sizeof( ClcContact ));

-	 memset((void*)contact->iWideExtraImage,0xFF,sizeof(contact->iWideExtraImage));

-	 return contact;

+	ClcContact* contact = (ClcContact*)mir_calloc(sizeof( ClcContact ));

+	memset(contact->iExtraImage, 0xFF, sizeof(contact->iExtraImage));

+	return contact;

 }

 

 ClcCacheEntry* cliCreateCacheItem( HANDLE hContact )

diff --git a/plugins/Clist_modern/src/modern_clcmsgs.cpp b/plugins/Clist_modern/src/modern_clcmsgs.cpp
index 5b3a3aafde..d5845db2e8 100644
--- a/plugins/Clist_modern/src/modern_clcmsgs.cpp
+++ b/plugins/Clist_modern/src/modern_clcmsgs.cpp
@@ -49,11 +49,6 @@ LRESULT cli_ProcessExternalMessages(HWND hwnd,struct ClcData *dat,UINT msg,WPARA
 		}

 		return 0;

 

-	case CLM_SETEXTRACOLUMNSSPACE:

-		dat->extraColumnSpacing = (int)wParam;

-		CLUI__cliInvalidateRect(hwnd,NULL,FALSE);

-		return 0;

-

 	case CLM_SETFONT:

 		if (HIWORD(lParam) < 0 || HIWORD(lParam)>FONTID_MODERN_MAX) return 0;

 

@@ -226,37 +221,9 @@ LRESULT cli_ProcessExternalMessages(HWND hwnd,struct ClcData *dat,UINT msg,WPARA
 		if ( !pcli->pfnFindItem(hwnd, dat, (HANDLE) wParam, &contact, NULL, NULL))

 			return 0;

 

-		contact->iExtraImage[LOWORD(lParam)] = (BYTE)  HIWORD(lParam); //set oldstyle icon

-		contact->iWideExtraImage[LOWORD(lParam)] = (WORD) 0xFFFF; //reset wide icon

+		contact->iExtraImage[LOWORD(lParam)] = HIWORD(lParam);

 		pcli->pfnInvalidateRect(hwnd, NULL, FALSE);

 		return 0;

-

-	case CLM_SETWIDEEXTRAIMAGE:

-		if (LOWORD(lParam) >= dat->extraColumnsCount)

-			return 0;

-

-		if ( !pcli->pfnFindItem(hwnd, dat, (HANDLE) wParam, &contact, NULL, NULL))

-			return 0;

-

-		contact->iExtraImage[LOWORD(lParam)] = (BYTE) 0xFF; //reset oldstyle icon

-		contact->iWideExtraImage[LOWORD(lParam)] = (WORD) HIWORD(lParam); //set wide icon

-		pcli->pfnInvalidateRect(hwnd, NULL, FALSE);

-		return 0;

-

-	case CLM_SETEXTRAIMAGELIST:

-		dat->himlExtraColumns = (HIMAGELIST) lParam;

-		dat->himlWideExtraColumns = (HIMAGELIST) wParam;

-		pcli->pfnInvalidateRect(hwnd, NULL, FALSE);

-		return 0;

-

-	case CLM_GETWIDEEXTRAIMAGE:

-		if (LOWORD(lParam) >= dat->extraColumnsCount)

-			return 0xFFFF;

-

-		if ( !pcli->pfnFindItem(hwnd, dat, (HANDLE) wParam, &contact, NULL, NULL))

-			return 0xFFFF;

-

-		return contact->iWideExtraImage[LOWORD(lParam)];

 	}

 	return corecli.pfnProcessExternalMessages(hwnd, dat, msg, wParam, lParam);

 }

diff --git a/plugins/Clist_modern/src/modern_clcpaint.cpp b/plugins/Clist_modern/src/modern_clcpaint.cpp
index cc567908cd..1faa3b03f9 100644
--- a/plugins/Clist_modern/src/modern_clcpaint.cpp
+++ b/plugins/Clist_modern/src/modern_clcpaint.cpp
@@ -814,15 +814,12 @@ void CLCPaint::_PaintRowItemsEx( HWND hwnd, HDC hdcMem, struct ClcData *dat, Clc
 				{

 					COLORREF colourFg = dat->selBkColour;

 					int mode = BlendedInActiveState?BlendValue:ILD_NORMAL;

-					if ( Drawing->iExtraImage[iImage] == 0xFF && Drawing->iWideExtraImage[iImage] == 0xFFFF )

-					{

-						{

-							x += ( x>0 )?dat->extraColumnSpacing:ICON_HEIGHT;

-							SetRect( &rc, fr_rc.right-x, p_rect.top, fr_rc.right-x+ICON_HEIGHT, p_rect.bottom );

-							if ( dat->text_rtl != 0 ) _RTLRect( &rc, free_row_rc.right, 0 );

-							Drawing->pos_extra[iImage] = rc;

-							count++;

-						}

+					if (Drawing->iExtraImage[iImage] == 0xFFFF) {

+						x += ( x>0 )?dat->extraColumnSpacing:ICON_HEIGHT;

+						SetRect( &rc, fr_rc.right-x, p_rect.top, fr_rc.right-x+ICON_HEIGHT, p_rect.bottom );

+						if ( dat->text_rtl != 0 ) _RTLRect( &rc, free_row_rc.right, 0 );

+						Drawing->pos_extra[iImage] = rc;

+						count++;

 						continue;

 					}

 

@@ -843,13 +840,9 @@ void CLCPaint::_PaintRowItemsEx( HWND hwnd, HDC hdcMem, struct ClcData *dat, Clc
 					if ( dat->text_rtl != 0 ) _RTLRect( &rc, free_row_rc.right, dx );

 					Drawing->pos_extra[iImage] = rc;

 					Drawing->pos_extra[iImage] = rc;

-					if ( Drawing->iExtraImage[iImage] != 0xFF )

+					if (Drawing->iExtraImage[iImage] != 0xFFFF)

 						ske_ImageList_DrawEx( dat->himlExtraColumns, Drawing->iExtraImage[iImage], hdcMem, 

-						rc.left, rc.top, 0, 0, CLR_NONE, colourFg, mode );

-					else if ( Drawing->iWideExtraImage[iImage] != 0xFFFF )

-						ske_ImageList_DrawEx( dat->himlWideExtraColumns, Drawing->iWideExtraImage[iImage], hdcMem, 

-						rc.left, rc.top, 0, 0, CLR_NONE, colourFg, mode );

-

+							rc.left, rc.top, 0, 0, CLR_NONE, colourFg, mode );

 				}

 				fr_rc.right -= x;

 			}

@@ -1581,14 +1574,11 @@ void CLCPaint::_PaintRowItemsEx( HWND hwnd, HDC hdcMem, struct ClcData *dat, Clc
 						int count = 0;

 						RECT rc;

 						int x = 0;

-						for ( iImage = 0; iImage < dat->extraColumnsCount ; iImage++ )

-						{

+						for ( iImage = 0; iImage < dat->extraColumnsCount ; iImage++ ) {

 							COLORREF colourFg = dat->selBkColour;

 							int mode = BlendedInActiveState?BlendValue:ILD_NORMAL;

-							if ( Drawing->iExtraImage[iImage] == 0xFF && Drawing->iWideExtraImage[iImage] == 0xFFFF )

-							{

-								if ( !dat->MetaIgnoreEmptyExtra )

-								{

+							if (Drawing->iExtraImage[iImage] == 0xFFFF) {

+								if ( !dat->MetaIgnoreEmptyExtra) {

 									SetRect( &rc, p_rect.left+x, p_rect.top, p_rect.left+x+ICON_HEIGHT, p_rect.bottom );

 									x += dat->extraColumnSpacing;

 									if ( dat->text_rtl != 0 ) _RTLRect( &rc, free_row_rc.right, 0 );

@@ -1598,14 +1588,13 @@ void CLCPaint::_PaintRowItemsEx( HWND hwnd, HDC hdcMem, struct ClcData *dat, Clc
 								continue;

 							}

 

-							if ( selected ) mode = BlendedInActiveState?ILD_NORMAL:ILD_SELECTED;

-							else if ( hottrack )

-							{

+							if ( selected )

+								mode = BlendedInActiveState?ILD_NORMAL:ILD_SELECTED;

+							else if (hottrack) {

 								mode = BlendedInActiveState?ILD_NORMAL:ILD_FOCUS;

 								colourFg = dat->hotTextColour;

 							}

-							else if ( Drawing->type == CLCIT_CONTACT && Drawing->flags&CONTACTF_NOTONLIST )

-							{

+							else if (Drawing->type == CLCIT_CONTACT && (Drawing->flags & CONTACTF_NOTONLIST)) {

 								colourFg = dat->fontModernInfo[FONTID_NOTONLIST].colour;

 								mode = BlendValue;

 							}

@@ -1615,12 +1604,9 @@ void CLCPaint::_PaintRowItemsEx( HWND hwnd, HDC hdcMem, struct ClcData *dat, Clc
 							count++;

 							if ( dat->text_rtl != 0 ) _RTLRect( &rc, free_row_rc.right, 0 );

 							Drawing->pos_extra[iImage] = rc;

-							if ( Drawing->iExtraImage[iImage] != 0xFF )

+							if (Drawing->iExtraImage[iImage] != 0xFFFF)

 								ske_ImageList_DrawEx( dat->himlExtraColumns, Drawing->iExtraImage[iImage], hdcMem, 

-								rc.left, rc.top, 0, 0, CLR_NONE, colourFg, mode );

-							else if ( Drawing->iWideExtraImage[iImage] != 0xFFFF )

-								ske_ImageList_DrawEx( dat->himlWideExtraColumns, Drawing->iWideExtraImage[iImage], hdcMem, 

-								rc.left, rc.top, 0, 0, CLR_NONE, colourFg, mode );

+									rc.left, rc.top, 0, 0, CLR_NONE, colourFg, mode );

 						}

 					}

 					break;

@@ -1640,8 +1626,7 @@ void CLCPaint::_PaintRowItemsEx( HWND hwnd, HDC hdcMem, struct ClcData *dat, Clc
 					{

 						int eNum = gl_RowTabAccess[i]->type-TC_EXTRA1;

 						if ( eNum < dat->extraColumnsCount )

-							if ( Drawing->iExtraImage[eNum] != 0xFF || Drawing->iWideExtraImage[eNum] != 0xFFFF )

-							{

+							if (Drawing->iExtraImage[eNum] != 0xFFFF) {

 								int mode = 0;

 								int BlendedInActiveState = dat->dbbBlendInActiveState;

 								int BlendValue = dat->dbbBlend25 ? ILD_BLEND25 : ILD_BLEND50;

@@ -1663,12 +1648,9 @@ void CLCPaint::_PaintRowItemsEx( HWND hwnd, HDC hdcMem, struct ClcData *dat, Clc
 								}

 								if ( dat->text_rtl != 0 ) _RTLRect( &p_rect, free_row_rc.right, 0 );

 								Drawing->pos_extra[eNum] = p_rect;

-								if ( Drawing->iExtraImage[eNum] != 0xFF )

+								if (Drawing->iExtraImage[eNum] != 0xFFFF)

 									ske_ImageList_DrawEx( dat->himlExtraColumns, Drawing->iExtraImage[eNum], hdcMem, 

-									p_rect.left, p_rect.top, 0, 0, CLR_NONE, colourFg, mode );

-								else if ( Drawing->iWideExtraImage[eNum] != 0xFFFF )

-									ske_ImageList_DrawEx( dat->himlWideExtraColumns, Drawing->iWideExtraImage[eNum], hdcMem, 

-									p_rect.left, p_rect.top, 0, 0, CLR_NONE, colourFg, mode );

+										p_rect.left, p_rect.top, 0, 0, CLR_NONE, colourFg, mode );

 							}

 					}

 				}

@@ -2558,14 +2540,11 @@ void CLCPaint::_CalcItemsPos( HWND hwnd, HDC hdcMem, struct ClcData *dat, ClcCon
 					int count = 0;

 					RECT rc;

 

-					for ( iImage = dat->extraColumnsCount-1 ; iImage >= 0 ; iImage -- )

-					{

-						if ( Drawing->iExtraImage[iImage] != 0xFF || Drawing->iWideExtraImage[iImage] != 0xFFFF || !dat->MetaIgnoreEmptyExtra )

-						{

+					for ( iImage = dat->extraColumnsCount-1 ; iImage >= 0 ; iImage-- ) {

+						if ( Drawing->iExtraImage[iImage] != 0xFFFF || !dat->MetaIgnoreEmptyExtra ) {

 							rc = _GetRectangle( dat, &row_rc, &free_row_rc, &left_pos, &right_pos, 

 								left, dat->extraColumnSpacing, dat->extraColumnSpacing, ICON_HEIGHT, 0 );

-							if ( rc.left < rc.right )

-							{

+							if (rc.left < rc.right) {

 								// Store position

 								_StoreItemPos( Drawing, CIT_EXTRA|( iImage&0x3F ), &rc );

 								//Drawing->pos_extra[iImage] = rc;

@@ -3261,17 +3240,13 @@ void CLCPaint::_DrawContactSelection( HDC hdcMem, struct ClcData *dat, ClcContac
 void CLCPaint::_DrawContactExtraIcon( HDC hdcMem, struct ClcData *dat, ClcContact *Drawing, int& selected, int& hottrack, RECT& text_rc, RECT * rc, int iImage )

 {

 	//Draw extra icon

-	COLORREF colourFg;

-	int mode;

-	if ( iImage != -1 )

-	{

+	if ( iImage != -1 ) {

+		int mode;

+		COLORREF colourFg;

 		_GetBlendMode( dat, Drawing, selected, hottrack, GIM_EXTRAICON_AFFECT, &colourFg, &mode );

-		if ( Drawing->iExtraImage[iImage] != 0xFF )

+		if (Drawing->iExtraImage[iImage] != 0xFFFF)

 			ske_ImageList_DrawEx( dat->himlExtraColumns, Drawing->iExtraImage[iImage], hdcMem, 

-			rc->left, rc->top, 0, 0, CLR_NONE, colourFg, mode );

-		else if ( Drawing->iWideExtraImage[iImage] != 0xFFFF )

-			ske_ImageList_DrawEx( dat->himlWideExtraColumns, Drawing->iWideExtraImage[iImage], hdcMem, 

-			rc->left, rc->top, 0, 0, CLR_NONE, colourFg, mode );

+				rc->left, rc->top, 0, 0, CLR_NONE, colourFg, mode );

 	}

 }

 

diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp
index 79e947940b..872cb6e165 100644
--- a/plugins/Clist_modern/src/modern_clui.cpp
+++ b/plugins/Clist_modern/src/modern_clui.cpp
@@ -2701,7 +2701,6 @@ LRESULT CLUI::OnListRebuildNotify(NMCLISTCONTROL *pnmc)
 

 LRESULT CLUI::OnListSizeChangeNotify( NMCLISTCONTROL * pnmc )

 {

-

 	// TODO: Check and refactor possible problem of clist resized to full screen problem

 	static RECT rcWindow,rcTree,rcTree2,rcWorkArea,rcOld;

 	int maxHeight, minHeight,newHeight;

diff --git a/plugins/Clist_modern/src/modern_rowheight_funcs.cpp b/plugins/Clist_modern/src/modern_rowheight_funcs.cpp
index 2a9a1df6ef..411fa0234a 100644
--- a/plugins/Clist_modern/src/modern_rowheight_funcs.cpp
+++ b/plugins/Clist_modern/src/modern_rowheight_funcs.cpp
@@ -259,7 +259,7 @@ int mod_CalcRowHeight_worker(struct ClcData *dat, HWND hwnd, ClcContact *contact
 					BOOL hasExtra = FALSE;

 					int width = 0;

 					for (int k = 0; k < dat->extraColumnsCount; k++)

-						if (contact->iExtraImage[k] != 0xFF || contact->iWideExtraImage[k] != 0xFFFF || !dat->MetaIgnoreEmptyExtra) {

+						if (contact->iExtraImage[k] != 0xFFFF || !dat->MetaIgnoreEmptyExtra) {

 							hasExtra = TRUE;

 							if (item != -1) break;

 							width += (width>0)?dat->extraColumnSpacing:(dat->extraColumnSpacing-2);

@@ -285,7 +285,7 @@ int mod_CalcRowHeight_worker(struct ClcData *dat, HWND hwnd, ClcContact *contact
 				{

 					int eNum = gl_RowTabAccess[i]->type-TC_EXTRA1;

 					if (eNum < dat->extraColumnsCount)

-						if (contact->iExtraImage[eNum] != 255 || contact->iWideExtraImage[eNum] != 0xFFFF || !dat->MetaIgnoreEmptyExtra) {

+						if (contact->iExtraImage[eNum] != 0xFFFF || !dat->MetaIgnoreEmptyExtra) {

 							gl_RowTabAccess[i]->h = ICON_HEIGHT;

 							gl_RowTabAccess[i]->w = ICON_HEIGHT;

 						}