From ba4e625ef4f8159b79bf7a2be83a5e706c3e655b Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sat, 28 May 2016 15:34:40 +0000
Subject: fixes #1246 (Stripped height of rows in clist_modern)

git-svn-id: http://svn.miranda-ng.org/main/trunk@16882 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Clist_modern/src/modern_clc.cpp      |  5 ++---
 plugins/Clist_modern/src/modern_clcpaint.cpp | 13 ++++++-------
 2 files changed, 8 insertions(+), 10 deletions(-)

(limited to 'plugins/Clist_modern/src')

diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp
index 914cc0d175..078bcfbfc4 100644
--- a/plugins/Clist_modern/src/modern_clc.cpp
+++ b/plugins/Clist_modern/src/modern_clc.cpp
@@ -229,9 +229,8 @@ static int clcSearchNextContact(HWND hwnd, ClcData *dat, int index, const TCHAR
 				TCHAR *lowered_search = CharLowerW(NEWTSTR_ALLOCA(dat->szQuickSearch));
 				found = _tcsstr(lowered_szText, lowered_search) != NULL;
 			}
-			else {
-				found = ((prefixOk && CSTR_EQUAL == CompareString(LOCALE_INVARIANT, NORM_IGNORECASE, text, -1, cc->szText, testlen)) || (!prefixOk && !mir_tstrcmpi(text, cc->szText)));
-			}
+			else found = ((prefixOk && CSTR_EQUAL == CompareString(LOCALE_INVARIANT, NORM_IGNORECASE, text, -1, cc->szText, testlen)) || (!prefixOk && !mir_tstrcmpi(text, cc->szText)));
+
 			if (found) {
 				ClcGroup *contactGroup = group;
 				int contactScanIndex = group->scanIndex;
diff --git a/plugins/Clist_modern/src/modern_clcpaint.cpp b/plugins/Clist_modern/src/modern_clcpaint.cpp
index 0091db8bce..40aabd0e9c 100644
--- a/plugins/Clist_modern/src/modern_clcpaint.cpp
+++ b/plugins/Clist_modern/src/modern_clcpaint.cpp
@@ -1591,7 +1591,7 @@ void CLCPaint::_DrawBackground(HWND hWnd, ClcData *dat, int paintMode, RECT *rcP
 		if (!(paintMode & DM_GREYALTERNATE))
 			SkinDrawGlyph(pc.hdcMem, &clRect, rcPaint, "CL,ID=Background,Type=Control");
 	}
-	else if (paintMode&DM_CLASSIC) {
+	else if (paintMode & DM_CLASSIC) {
 		if (!_DrawNonEnginedBackground(pc.hdcMem, rcPaint, clRect, dat)) {
 			HBRUSH hBrush = CreateSolidBrush(pc.tmpbkcolour);
 			FillRect(pc.hdcMem, rcPaint, hBrush);
@@ -1599,8 +1599,8 @@ void CLCPaint::_DrawBackground(HWND hWnd, ClcData *dat, int paintMode, RECT *rcP
 		}
 	}
 	else {
-		if (paintMode&DM_NON_LAYERED)
-			ske_BltBackImage(hWnd, (paintMode&DM_GRAY) ? pc.hdcMem2 : pc.hdcMem, rcPaint);
+		if (paintMode & DM_NON_LAYERED)
+			ske_BltBackImage(hWnd, (paintMode & DM_GRAY) ? pc.hdcMem2 : pc.hdcMem, rcPaint);
 
 		SkinDrawGlyph(pc.hdcMem, &clRect, rcPaint, "CL,ID=Background");
 	}
@@ -1631,8 +1631,7 @@ void CLCPaint::_DrawLines(HWND hWnd, ClcData *dat, int paintMode, RECT *rcPaint,
 		line_num++;
 
 		// Draw line, if needed
-		int iRowHeight = dat->getRowHeight(line_num);
-		if (y > rcPaint->top - iRowHeight) {
+		if (y > rcPaint->top - dat->getRowHeight(line_num)) {
 			RECT rc;
 
 			// Get item to draw
@@ -1663,7 +1662,7 @@ void CLCPaint::_DrawLines(HWND hWnd, ClcData *dat, int paintMode, RECT *rcPaint,
 				int right_pos = dat->rightMargin;   // Border
 
 				RECT row_rc;
-				SetRect(&row_rc, clRect.left, y, clRect.right, y + iRowHeight);
+				SetRect(&row_rc, clRect.left, y, clRect.right, y + dat->getRowHeight(line_num));
 
 				RECT free_row_rc = row_rc;
 				free_row_rc.left += left_pos;
@@ -1799,7 +1798,7 @@ void CLCPaint::_DrawLines(HWND hWnd, ClcData *dat, int paintMode, RECT *rcPaint,
 				}
 			}
 		}
-		y += iRowHeight;
+		y += dat->getRowHeight(line_num);
 
 		// increment by subcontacts
 		ClcContact *cc = group->cl[group->scanIndex];
-- 
cgit v1.2.3