diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-09-25 10:58:24 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-09-25 10:58:24 +0000 |
| commit | dd1460d664f7266920b07527f25f87ec8233daaf (patch) | |
| tree | 3753e6fa678edf1b3d9bb020bb97e16ca75ff69d /src/modules/clist/clcutils.cpp | |
| parent | 9ff92d1cc83e39859891a65f5ada186806cef133 (diff) | |
valid options initialization
git-svn-id: http://svn.miranda-ng.org/main/trunk@6225 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src/modules/clist/clcutils.cpp')
| -rw-r--r-- | src/modules/clist/clcutils.cpp | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/modules/clist/clcutils.cpp b/src/modules/clist/clcutils.cpp index 4de2705787..e6ad8acf57 100644 --- a/src/modules/clist/clcutils.cpp +++ b/src/modules/clist/clcutils.cpp @@ -67,7 +67,6 @@ int fnHitTest(HWND hwnd, struct ClcData *dat, int testx, int testy, ClcContact * ClcContact *hitcontact = NULL;
ClcGroup *hitgroup = NULL;
int indent, i;
- HFONT hFont;
DWORD style = GetWindowLongPtr(hwnd, GWL_STYLE);
if (flags)
@@ -79,20 +78,16 @@ int fnHitTest(HWND hwnd, struct ClcData *dat, int testx, int testy, ClcContact * ClientToScreen(hwnd, &pt);
HWND hwndParent = hwnd, hwndTemp;
- do
- {
+ do {
hwndTemp = hwndParent;
hwndParent = (HWND)GetWindowLongPtr(hwndTemp, GWLP_HWNDPARENT);
POINT pt1 = pt;
ScreenToClient(hwndParent, &pt1);
- HWND h = ChildWindowFromPointEx(hwndParent ? hwndParent : GetDesktopWindow(),
- pt1, CWP_SKIPINVISIBLE | CWP_SKIPTRANSPARENT);
+ HWND h = ChildWindowFromPointEx(hwndParent ? hwndParent : GetDesktopWindow(), pt1, CWP_SKIPINVISIBLE | CWP_SKIPTRANSPARENT);
if (h != hwndTemp)
- {
if ( !hwndParent || !(GetWindowLongPtr(hwndTemp, GWL_STYLE) & BS_GROUPBOX))
return -1;
- }
}
while (hwndParent);
@@ -164,11 +159,9 @@ int fnHitTest(HWND hwnd, struct ClcData *dat, int testx, int testy, ClcContact * return hit;
}
}
+
HDC hdc = GetDC(hwnd);
- if (hitcontact->type == CLCIT_GROUP)
- hFont = (HFONT)SelectObject(hdc, dat->fontInfo[FONTID_GROUPS].hFont);
- else
- hFont = (HFONT)SelectObject(hdc, dat->fontInfo[FONTID_CONTACTS].hFont);
+ HFONT hFont = (HFONT)SelectObject(hdc, dat->fontInfo[hitcontact->type == CLCIT_GROUP ? FONTID_GROUPS : FONTID_CONTACTS].hFont);
SIZE textSize;
GetTextExtentPoint32(hdc, hitcontact->szText, lstrlen(hitcontact->szText), &textSize);
|