diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-08-18 11:49:54 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-08-18 11:49:54 +0000 |
| commit | 878d72910cccf4f84c7cb45bb4c11134920f3166 (patch) | |
| tree | 251fba89632c389309ff9b2451850aa949efb8d0 /plugins/TipperYM/src | |
| parent | 871410044ecbac0d2dd67a7c98f8bcd2df9410eb (diff) | |
- naming conflict;
- warning fixes;
- code cleaning
git-svn-id: http://svn.miranda-ng.org/main/trunk@14988 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/TipperYM/src')
| -rw-r--r-- | plugins/TipperYM/src/mir_smileys.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
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;
|