From 878d72910cccf4f84c7cb45bb4c11134920f3166 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 18 Aug 2015 11:49:54 +0000 Subject: - naming conflict; - warning fixes; - code cleaning git-svn-id: http://svn.miranda-ng.org/main/trunk@14988 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/TipperYM/src/mir_smileys.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'plugins/TipperYM/src') diff --git a/plugins/TipperYM/src/mir_smileys.cpp b/plugins/TipperYM/src/mir_smileys.cpp index 3aeafcb697..05095a2fea 100644 --- a/plugins/TipperYM/src/mir_smileys.cpp +++ b/plugins/TipperYM/src/mir_smileys.cpp @@ -133,13 +133,13 @@ SIZE GetTextSize(HDC hdcMem, const TCHAR *szText, SMILEYPARSEINFO info, UINT uTe info->row_height[row_count] = max(info->row_height[row_count], text_height); if (piece->type == TEXT_PIECE_TYPE_TEXT) { - RECT text_rc = { 0, 0, 2048, 2048 }; + RECT rc = { 0, 0, 2048, 2048 }; - DrawText(hdcMem, szText + piece->start_pos, piece->len, &text_rc, DT_CALCRECT | uTextFormat); - pos_x += (text_rc.right - text_rc.left); + DrawText(hdcMem, szText + piece->start_pos, piece->len, &rc, DT_CALCRECT | uTextFormat); + pos_x += (rc.right - rc.left); if (pos_x > max_width) { - text_size.cx = max(text_size.cx, pos_x - (text_rc.right - text_rc.left)); - pos_x = text_rc.right - text_rc.left; + text_size.cx = max(text_size.cx, pos_x - (rc.right - rc.left)); + pos_x = rc.right - rc.left; info->row_height[++row_count] = text_height; } @@ -148,7 +148,6 @@ SIZE GetTextSize(HDC hdcMem, const TCHAR *szText, SMILEYPARSEINFO info, UINT uTe pos_x = 0; info->row_height[++row_count] = 0; } - } else { double factor; -- cgit v1.2.3