From 0a668c8eb335ba601d97fc7c8dbbecb1c7455408 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 4 Nov 2012 22:36:16 +0000 Subject: 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 --- include/m_clc.h | 11 ++++------- include/m_clistint.h | 12 +++++++----- 2 files changed, 11 insertions(+), 12 deletions(-) (limited to 'include') diff --git a/include/m_clc.h b/include/m_clc.h index 969f5aee21..bb6befc7dc 100644 --- a/include/m_clc.h +++ b/include/m_clc.h @@ -86,6 +86,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define CLM_GETITEMTEXT (CLM_FIRST+21) //wParam = hItem, lParam = (TCHAR*)pszStr, max 120 bytes #define CLM_GETSCROLLTIME (CLM_FIRST+22) //returns time in ms #define CLM_GETSELECTION (CLM_FIRST+23) //returns hItem +#define CLM_SETEXTRASPACE (CLM_FIRST+24) //wParam=extra space between icons + #define CLCHT_ABOVE 0x0001 //above client area #define CLCHT_BELOW 0x0002 //below client area #define CLCHT_TOLEFT 0x0004 //left of client area @@ -113,9 +115,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define CLM_SETBKBITMAP (CLM_FIRST+27) //wParam = mode, lParam = hBitmap (don't delete it), NULL for none #define CLM_SETBKCOLOR (CLM_FIRST+28) //wParam = a COLORREF, default is GetSysColor(COLOR_3DFACE) #define CLM_SETCHECKMARK (CLM_FIRST+29) //wParam = hItem, lParam = 1 or 0 -#define CLM_SETEXTRACOLUMNS (CLM_FIRST+30) //wParam = number of extra columns (zero to MAXEXTRACOLUMNS from clc.h, currently 16) +#define CLM_SETEXTRACOLUMNS (CLM_FIRST+30) //wParam = number of extra columns (zero to EXTRA_ICON_COUNT from clc.h, currently 16) #define CLM_SETEXTRAIMAGE (CLM_FIRST+31) //wParam = hItem, lParam = MAKELPARAM(iColumn (0 based),iImage). iImage = 0xFF is a blank -#define CLM_SETEXTRAIMAGELIST (CLM_FIRST+32) //lParam = HIMAGELIST, wParam = WideImageList +#define CLM_SETEXTRAIMAGELIST (CLM_FIRST+32) //lParam = HIMAGELIST #define FONTID_CONTACTS 0 #define FONTID_INVIS 1 @@ -190,11 +192,6 @@ typedef struct { #define CLM_GETTEXTCOLOR (CLM_FIRST+51) //wParam = FONTID_, returns COLORREF #define CLM_SETTEXTCOLOR (CLM_FIRST+52) //wParam = FONTID_, lParam = COLORREF -#define CLM_SETWIDEEXTRAIMAGE (CLM_FIRST+60) //wParam = hItem, lParam = MAKELPARAM(iColumn (0 based), iImage). iImage = 0xFFFF is a blank -#define CLM_GETWIDEEXTRAIMAGE (CLM_FIRST+61) //wParam = hItem, lParam = MAKELPARAM(iColumn (0 based), 0), returns iImage or 0xFF -#define CLM_GETWIDEEXTRAIMAGELIST (CLM_FIRST+62) //returns HWIDEIMAGELIST -#define CLM_SETEXTRACOLUMNSSPACE (CLM_FIRST+63) //wParam=extra space between icons - //notifications (most are omitted because the control processes everything) #define CLNF_ISGROUP 1 #define CLNF_ISINFO 2 diff --git a/include/m_clistint.h b/include/m_clistint.h index e82c39d565..04053e77e3 100644 --- a/include/m_clistint.h +++ b/include/m_clistint.h @@ -35,7 +35,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define IsHContactGroup(h) (((UINT_PTR)(h)^HCONTACT_ISGROUP)<(HCONTACT_ISGROUP^HCONTACT_ISINFO)) #define IsHContactInfo(h) (((UINT_PTR)(h)&HCONTACT_ISINFO) == HCONTACT_ISINFO) #define IsHContactContact(h) (((UINT_PTR)(h)&HCONTACT_ISGROUP) == 0) -#define MAXEXTRACOLUMNS 16 + +#ifndef EXTRA_ICON_COUNT +#define EXTRA_ICON_COUNT 10 +#endif #define MAX_TIP_SIZE 2048 @@ -110,8 +113,8 @@ struct ClcContactBase ClcGroup *group; }; }; - BYTE iExtraImage[MAXEXTRACOLUMNS]; - TCHAR szText[120-MAXEXTRACOLUMNS]; + WORD iExtraImage[EXTRA_ICON_COUNT]; + TCHAR szText[120-EXTRA_ICON_COUNT]; char *proto; // MS_PROTO_GETBASEPROTO }; @@ -121,7 +124,7 @@ struct ClcDataBase int rowHeight; int yScroll; int selection; - struct ClcFontInfo fontInfo[FONTID_MAX + 1]; + ClcFontInfo fontInfo[FONTID_MAX + 1]; int scrollTime; HIMAGELIST himlHighlight; int groupIndent; @@ -471,7 +474,6 @@ typedef struct /************************************************************************************* * version 7 additions (0.11.0.x) - extra images *************************************************************************************/ - HIMAGELIST hExtraImageList; void (*pfnReloadExtraIcons)(void); void (*pfnSetAllExtraIcons)(HWND hwndList,HANDLE hContact); } -- cgit v1.2.3