diff options
| author | George Hazan <ghazan@miranda.im> | 2018-04-06 20:59:25 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-04-06 20:59:25 +0300 |
| commit | 205963dfbb2297f5fab4adeec027342394329d2d (patch) | |
| tree | bbf0df9820b79995c1b631bee47f8294c8ab4a83 /plugins/Clist_nicer | |
| parent | da9aa1870502d88752c5482e3eb2d2548dd64984 (diff) | |
CLIST_INTERFACE::pfnGetGroupCountsText => Clist_GetGroupCountsText
CLIST_INTERFACE::pfnEnsureVisible => Clist_EnsureVisible
Diffstat (limited to 'plugins/Clist_nicer')
| -rw-r--r-- | plugins/Clist_nicer/src/clc.cpp | 6 | ||||
| -rw-r--r-- | plugins/Clist_nicer/src/clcpaint.cpp | 2 | ||||
| -rw-r--r-- | plugins/Clist_nicer/src/clcutils.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/plugins/Clist_nicer/src/clc.cpp b/plugins/Clist_nicer/src/clc.cpp index 839ba5f020..dd858bec85 100644 --- a/plugins/Clist_nicer/src/clc.cpp +++ b/plugins/Clist_nicer/src/clc.cpp @@ -620,7 +620,7 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L InvalidateRect(hwnd, nullptr, FALSE);
if (dat->selection != -1)
- pcli->pfnEnsureVisible(hwnd, dat, dat->selection, 0);
+ Clist_EnsureVisible(hwnd, dat, dat->selection, 0);
if (hitFlags & CLCHT_ONAVATAR && cfg::dat.bDblClkAvatars) {
CallService(MS_USERINFO_SHOWDIALOG, (WPARAM)contact->hContact, 0);
return TRUE;
@@ -645,7 +645,7 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L if (pt.x == -1 && pt.y == -1) {
dat->selection = pcli->pfnGetRowByIndex(dat, dat->selection, &contact, nullptr);
if (dat->selection != -1)
- pcli->pfnEnsureVisible(hwnd, dat, dat->selection, 0);
+ Clist_EnsureVisible(hwnd, dat, dat->selection, 0);
pt.x = dat->iconXSpace + 15;
pt.y = RowHeight::getItemTopY(dat, dat->selection) - dat->yScroll + (int)(dat->row_heights[dat->selection] * .7);
hitFlags = dat->selection == -1 ? CLCHT_NOWHERE : CLCHT_ONITEMLABEL;
@@ -656,7 +656,7 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L }
InvalidateRect(hwnd, nullptr, FALSE);
if (dat->selection != -1)
- pcli->pfnEnsureVisible(hwnd, dat, dat->selection, 0);
+ Clist_EnsureVisible(hwnd, dat, dat->selection, 0);
UpdateWindow(hwnd);
HMENU hMenu = nullptr;
diff --git a/plugins/Clist_nicer/src/clcpaint.cpp b/plugins/Clist_nicer/src/clcpaint.cpp index a2476af09e..0db2306540 100644 --- a/plugins/Clist_nicer/src/clcpaint.cpp +++ b/plugins/Clist_nicer/src/clcpaint.cpp @@ -503,7 +503,7 @@ set_bg_l: if (type == CLCIT_GROUP) {
GetTextExtentPoint32(hdcMem, contact->szText, (int)mir_wstrlen(contact->szText), &textSize);
int width = textSize.cx;
- szCounts = pcli->pfnGetGroupCountsText(dat, contact);
+ szCounts = Clist_GetGroupCountsText(dat, contact);
if (szCounts[0]) {
GetTextExtentPoint32(hdcMem, L" ", 1, &spaceSize);
ChangeToFont(hdcMem, dat, FONTID_GROUPCOUNTS, &fontHeight);
diff --git a/plugins/Clist_nicer/src/clcutils.cpp b/plugins/Clist_nicer/src/clcutils.cpp index 82e9722c2f..c59a735535 100644 --- a/plugins/Clist_nicer/src/clcutils.cpp +++ b/plugins/Clist_nicer/src/clcutils.cpp @@ -168,7 +168,7 @@ int RTL_HitTest(HWND hwnd, struct ClcData *dat, int testx, ClcContact *hitcontac width = textSize.cx;
if (hitcontact->type == CLCIT_GROUP) {
wchar_t *szCounts;
- szCounts = pcli->pfnGetGroupCountsText(dat, hitcontact);
+ szCounts = Clist_GetGroupCountsText(dat, hitcontact);
if (szCounts[0]) {
GetTextExtentPoint32(hdc, L" ", 1, &textSize);
width += textSize.cx;
@@ -309,7 +309,7 @@ int HitTest(HWND hwnd, struct ClcData *dat, int testx, int testy, ClcContact **c width = textSize.cx;
if (hitcontact->type == CLCIT_GROUP) {
wchar_t *szCounts;
- szCounts = pcli->pfnGetGroupCountsText(dat, hitcontact);
+ szCounts = Clist_GetGroupCountsText(dat, hitcontact);
if (szCounts[0]) {
GetTextExtentPoint32(hdc, L" ", 1, &textSize);
width += textSize.cx;
|