From c8b51e0745cc481644752d29c1c779e14e3530bb Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 23 May 2016 13:32:02 +0000 Subject: - optimization in cli_SaveStateAndRebuildList applied to all clists (bLockScrollbar); - boolean variables were made bool; git-svn-id: http://svn.miranda-ng.org/main/trunk@16863 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Clist_blind/src/clcpaint.cpp | 8 +++----- plugins/Clist_blind/src/init.cpp | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) (limited to 'plugins/Clist_blind/src') diff --git a/plugins/Clist_blind/src/clcpaint.cpp b/plugins/Clist_blind/src/clcpaint.cpp index 37b3eb92e7..3364feb5cf 100644 --- a/plugins/Clist_blind/src/clcpaint.cpp +++ b/plugins/Clist_blind/src/clcpaint.cpp @@ -150,7 +150,7 @@ void PaintClc(HWND hwnd, struct ClcData *dat, HDC hdc, RECT * rcPaint) int grey = 0, groupCountsFontTopShift; HBRUSH hBrushAlternateGrey = NULL; // yes I know about GetSysColorBrush() - COLORREF tmpbkcolour = style & CLS_CONTACTLIST ? (dat->useWindowsColours ? GetSysColor(COLOR_3DFACE) : dat->bkColour) : dat->bkColour; + COLORREF tmpbkcolour = style & CLS_CONTACTLIST ? (dat->bUseWindowsColours ? GetSysColor(COLOR_3DFACE) : dat->bkColour) : dat->bkColour; if (dat->greyoutFlags & pcli->pfnClcStatusToPf2(status) || style & WS_DISABLED) grey = 1; @@ -265,7 +265,7 @@ void PaintClc(HWND hwnd, struct ClcData *dat, HDC hdc, RECT * rcPaint) ClcContact *cc = group->cl.items[group->scanIndex]; if (y > rcPaint->top - dat->rowHeight) { int iImage = -1; - int selected = index == dat->selection && (dat->showSelAlways || dat->exStyle & CLS_EX_SHOWSELALWAYS || GetFocus() == hwnd) && cc->type != CLCIT_DIVIDER; + int selected = index == dat->selection && (dat->bShowSelAlways || dat->exStyle & CLS_EX_SHOWSELALWAYS || GetFocus() == hwnd) && cc->type != CLCIT_DIVIDER; int hottrack = dat->exStyle & CLS_EX_TRACKSELECT && cc->type != CLCIT_DIVIDER && dat->iHotTrack == index; SIZE textSize, countsSize = { 0 }, spaceSize = { 0 }; int width, checkboxWidth; @@ -359,9 +359,7 @@ void PaintClc(HWND hwnd, struct ClcData *dat, HDC hdc, RECT * rcPaint) colourFg = dat->fontInfo[FONTID_NOTONLIST].colour; mode = ILD_BLEND50; } - if (cc->type == CLCIT_CONTACT && dat->showIdle - && (cc->flags & CONTACTF_IDLE) - && GetRealStatus(cc, ID_STATUS_OFFLINE) != ID_STATUS_OFFLINE) + if (cc->type == CLCIT_CONTACT && dat->bShowIdle && (cc->flags & CONTACTF_IDLE) && GetRealStatus(cc, ID_STATUS_OFFLINE) != ID_STATUS_OFFLINE) mode = ILD_SELECTED; ImageList_DrawEx(himlCListClc, iImage, hdcMem, dat->leftMargin + indent * dat->groupIndent + checkboxWidth, y + ((dat->rowHeight - 16) >> 1), 0, 0, CLR_NONE, colourFg, mode); diff --git a/plugins/Clist_blind/src/init.cpp b/plugins/Clist_blind/src/init.cpp index e5c3e230e8..eeaad5f1c4 100644 --- a/plugins/Clist_blind/src/init.cpp +++ b/plugins/Clist_blind/src/init.cpp @@ -630,7 +630,7 @@ void LoadClcOptions(HWND hwnd, ClcData *dat, BOOL bFirst) { coreCli.pfnLoadClcOptions(hwnd, dat, bFirst); - dat->filterSearch = 0; + dat->bFilterSearch = false; dat->rowHeight = SendMessage(dat->hwnd_list, LB_GETITEMHEIGHT, 0, 0); } @@ -642,7 +642,7 @@ int GetRowHeight(ClcData *dat, int) void SortCLC(HWND hwnd, ClcData *dat, int useInsertionSort) { - if (dat->needsResort) { + if (dat->bNeedsResort) { coreCli.pfnSortCLC(hwnd, dat, useInsertionSort); dat->need_rebuild = TRUE; } -- cgit v1.2.3