diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-11-04 22:36:16 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-11-04 22:36:16 +0000 |
| commit | 0a668c8eb335ba601d97fc7c8dbbecb1c7455408 (patch) | |
| tree | 5ea7696fe3e98623abfad58e62422b5538e2a36e /plugins/Clist_mw/src/clcutils.cpp | |
| parent | 3ed8130e44a7f076fba9f4957c09920716441f48 (diff) | |
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
Diffstat (limited to 'plugins/Clist_mw/src/clcutils.cpp')
| -rw-r--r-- | plugins/Clist_mw/src/clcutils.cpp | 51 |
1 files changed, 25 insertions, 26 deletions
diff --git a/plugins/Clist_mw/src/clcutils.cpp b/plugins/Clist_mw/src/clcutils.cpp index db47677f84..aca0b80d1f 100644 --- a/plugins/Clist_mw/src/clcutils.cpp +++ b/plugins/Clist_mw/src/clcutils.cpp @@ -92,38 +92,37 @@ int HitTest(HWND hwnd,struct ClcData *dat,int testx,int testy,struct ClcContact for (i = 0;i<dat->extraColumnsCount;i++) {
int x;
- if (hitcontact->iExtraImage[i] == 0xFF) continue;
+ if (hitcontact->iExtraImage[i] == 0xFFFF)
+ continue;
- if ((style&CLS_EX_MULTICOLUMNALIGNLEFT))
- {
- x = (dat->leftMargin+indent*dat->groupIndent+checkboxWidth+dat->iconXSpace-2+width);
- x += 16;
- x = x+dat->extraColumnSpacing*(ic);
- if (i == dat->extraColumnsCount-1) {x = clRect.right-18;}
- }else
- {
- int ir;
- if (dat->MetaIgnoreEmptyExtra)
- {
- int j;
- ir = 0;
- for (j = i;j<dat->extraColumnsCount;j++)
- if (hitcontact->iExtraImage[j] != 0xFF)
- ir++;
- }else
- ir = dat->extraColumnsCount-i;
-
- x = clRect.right-dat->extraColumnSpacing*ir;
+ if ((style & CLS_EX_MULTICOLUMNALIGNLEFT)) {
+ x = (dat->leftMargin+indent*dat->groupIndent+checkboxWidth+dat->iconXSpace-2+width);
+ x += 16;
+ x = x+dat->extraColumnSpacing*(ic);
+ if (i == dat->extraColumnsCount-1) {x = clRect.right-18;}
+ }
+ else {
+ int ir;
+ if (dat->MetaIgnoreEmptyExtra) {
+ ir = 0;
+ for (int j = i;j<dat->extraColumnsCount;j++)
+ if (hitcontact->iExtraImage[j] != 0xFFFF)
+ ir++;
}
+ else ir = dat->extraColumnsCount-i;
+
+ x = clRect.right-dat->extraColumnSpacing*ir;
+ }
ic++;
- if (testx>=x &&
- testx<x+cxSmIcon) {
- if (flags) *flags |= CLCHT_ONITEMEXTRA|(i<<24);
-
+ if (testx >= x && testx < x + cxSmIcon) {
+ if (flags)
+ *flags |= CLCHT_ONITEMEXTRA|(i<<24);
+
ReleaseDC(hwnd,hdc);
return hit;
- } }
+ }
+ }
if (hitcontact->type == CLCIT_GROUP)
oldfont = (HFONT)SelectObject(hdc,dat->fontInfo[FONTID_GROUPS].hFont);
|