From e6615c0f1818ef8f93994d8add1d194060f52612 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 18 Apr 2016 13:12:40 +0000 Subject: code cleaning git-svn-id: http://svn.miranda-ng.org/main/trunk@16712 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Clist_modern/src/modern_clc.cpp | 24 +++++++++++------------- plugins/Clist_modern/src/modern_clc.h | 5 ----- plugins/Clist_modern/src/modern_contact.cpp | 2 +- 3 files changed, 12 insertions(+), 19 deletions(-) (limited to 'plugins') diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp index fb79cbd2b0..eb903f5111 100644 --- a/plugins/Clist_modern/src/modern_clc.cpp +++ b/plugins/Clist_modern/src/modern_clc.cpp @@ -621,7 +621,7 @@ void clcSetDelayTimer(UINT_PTR uIDEvent, HWND hwnd, int nDelay) int delay = nDelay; if (delay == -1) { switch (uIDEvent) { - case TIMERID_DELAYEDRESORTCLC: delay = 10; break; + case TIMERID_DELAYEDRESORTCLC: delay = 200; break; case TIMERID_RECALCSCROLLBAR: delay = 10; break; case TIMERID_REBUILDAFTER: delay = 50; break; default: delay = 100; break; @@ -1366,12 +1366,11 @@ static LRESULT clcOnIntmGroupChanged(ClcData *dat, HWND hwnd, UINT, WPARAM wPara static LRESULT clcOnIntmIconChanged(ClcData *dat, HWND hwnd, UINT, WPARAM wParam, LPARAM lParam) { - ClcContact *contact = NULL; - ClcGroup *group = NULL; - int recalcScrollBar = 0, shouldShow; - BOOL needRepaint = FALSE; + bool needRepaint = false; int contacticon = corecli.pfnGetContactIcon(wParam); MCONTACT hSelItem = NULL; + + ClcGroup *selgroup; ClcContact *selcontact = NULL; char *szProto = GetContactProto(wParam); @@ -1383,19 +1382,20 @@ static LRESULT clcOnIntmIconChanged(ClcData *dat, HWND hwnd, UINT, WPARAM wParam DWORD style = GetWindowLongPtr(hwnd, GWL_STYLE); bool isVisiblebyFilter = (((style & CLS_SHOWHIDDEN) && nHiddenStatus != -1) || !nHiddenStatus); bool ifVisibleByClui = !pcli->pfnIsHiddenMode(dat, status); - bool isVisible = g_CluiData.bFilterEffective&CLVM_FILTER_STATUS ? TRUE : ifVisibleByClui; + bool isVisible = (g_CluiData.bFilterEffective & CLVM_FILTER_STATUS) ? TRUE : ifVisibleByClui; bool isIconChanged = cli_GetContactIcon(wParam) != LOWORD(lParam); - shouldShow = isVisiblebyFilter && (isVisible || isIconChanged); + int shouldShow = isVisiblebyFilter && (isVisible || isIconChanged); // XXX CLVM changed - this means an offline msg is flashing, so the contact should be shown + ClcGroup *group = NULL; + ClcContact *contact = NULL; if (!pcli->pfnFindItem(hwnd, dat, wParam, &contact, &group, NULL)) { if (shouldShow && CallService(MS_DB_CONTACT_IS, wParam, 0)) { if (dat->selection >= 0 && pcli->pfnGetRowByIndex(dat, dat->selection, &selcontact, NULL) != -1) hSelItem = (DWORD_PTR)pcli->pfnContactToHItem(selcontact); pcli->pfnAddContactToTree(hwnd, dat, wParam, (style & CLS_CONTACTLIST) == 0, 0); - recalcScrollBar = 1; needRepaint = TRUE; pcli->pfnFindItem(hwnd, dat, wParam, &contact, NULL, NULL); if (contact) { @@ -1407,7 +1407,7 @@ static LRESULT clcOnIntmIconChanged(ClcData *dat, HWND hwnd, UINT, WPARAM wParam } } else { - //item in list already + // item in list already if (contact && contact->iImage == lParam) return 0; @@ -1419,7 +1419,6 @@ static LRESULT clcOnIntmIconChanged(ClcData *dat, HWND hwnd, UINT, WPARAM wParam hSelItem = (DWORD_PTR)pcli->pfnContactToHItem(selcontact); pcli->pfnRemoveItemFromGroup(hwnd, group, contact, (style & CLS_CONTACTLIST) == 0); needRepaint = TRUE; - recalcScrollBar = 1; dat->needsResort = 1; } else if (contact) { @@ -1431,15 +1430,14 @@ static LRESULT clcOnIntmIconChanged(ClcData *dat, HWND hwnd, UINT, WPARAM wParam contact->image_is_special = image_is_special; if (!image_is_special) { //Only if it is status changing dat->needsResort = 1; - needRepaint = TRUE; + needRepaint = true; } else if (dat->m_paintCouter == contact->lastPaintCounter) //if contacts is visible - needRepaint = TRUE; + needRepaint = true; } } if (hSelItem) { - ClcGroup *selgroup; if (pcli->pfnFindItem(hwnd, dat, hSelItem, &selcontact, &selgroup, NULL)) dat->selection = pcli->pfnGetRowsPriorTo(&dat->list, selgroup, List_IndexOf((SortedList*)&selgroup->cl, selcontact)); else diff --git a/plugins/Clist_modern/src/modern_clc.h b/plugins/Clist_modern/src/modern_clc.h index e0c724cfec..df08939883 100644 --- a/plugins/Clist_modern/src/modern_clc.h +++ b/plugins/Clist_modern/src/modern_clc.h @@ -62,11 +62,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define CLBF_TILEVTOROWHEIGHT 0x0100 -#define TIMERID_RENAME 10 -#define TIMERID_DRAGAUTOSCROLL 11 -#define TIMERID_INFOTIP 13 -#define TIMERID_REBUILDAFTER 14 -#define TIMERID_DELAYEDRESORTCLC 15 #define TIMERID_SUBEXPAND 21 #define TIMERID_INVALIDATE 22 #define TIMERID_INVALIDATE_FULL 25 diff --git a/plugins/Clist_modern/src/modern_contact.cpp b/plugins/Clist_modern/src/modern_contact.cpp index c94c0d5ab4..e4ef1ff3c9 100644 --- a/plugins/Clist_modern/src/modern_contact.cpp +++ b/plugins/Clist_modern/src/modern_contact.cpp @@ -141,7 +141,7 @@ int cliCompareContacts(const ClcContact *contact1, const ClcContact *contact2) break; case SORTBY_PROTO: - if (contact1->proto == NULL || contact1->proto == NULL) + if (contact1->proto == NULL || contact2->proto == NULL) continue; r = GetProtoIndex(contact1->proto) - GetProtoIndex(contact2->proto); break; -- cgit v1.2.3