From 1db6d4aeccda0bb283ecd157d6a0f826784285de Mon Sep 17 00:00:00 2001 From: qwerty2501 Date: Wed, 8 Feb 2012 23:13:52 +0900 Subject: [PATCH] =?utf8?q?=E3=83=AA=E3=82=B9=E3=83=8A=E3=83=BC=E3=83=87?= =?utf8?q?=E3=83=BC=E3=82=BF=E7=99=BB=E9=8C=B2=E6=A9=9F=E8=83=BD(=E9=80=94?= =?utf8?q?=E4=B8=AD)?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- nlite.suo | Bin 163328 -> 163840 bytes nlite/nlite_chatData.cpp | 20 +++++++++++--------- nlite/nlite_chatData.h | 10 ++++++---- nlite/nlite_commentview.cpp | 8 ++++---- 4 files changed, 21 insertions(+), 17 deletions(-) diff --git a/nlite.suo b/nlite.suo index 8195887bc98b10ef040a30f864b8471dfac43ef4..5437274ae61a78fe3b860a3f4558fb47288790ed 100644 GIT binary patch delta 5206 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 HQ>*@OaZ??W delta 4825 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 G0{originBkFlag == TRUE){ - bkColor = comment.listenerData->bkColor; + bkColor = comment.listenerData->bgcolor; } else { @@ -1216,8 +1216,8 @@ overclientrect: }else if(chatData.listenerData->originBkFlag == TRUE){ - bkColor = chatData.listenerData->bkColor; - originBkBrush.CreateSolidBrush(chatData.listenerData->bkColor); + bkColor = chatData.listenerData->bgcolor; + originBkBrush.CreateSolidBrush(chatData.listenerData->bgcolor); } @@ -1380,7 +1380,7 @@ end: if(index == CCommentView::USERNAME){ - LPCTSTR viewStr = clickData->listenerData->userName.Length() == 0 ? clickData->listenerData->user_id : clickData->listenerData->userName; + LPCTSTR viewStr = clickData->listenerData->name.Length() == 0 ? clickData->listenerData->user_id : clickData->listenerData->name; cdc.DrawTextW(viewStr ,_tcslen(viewStr),&calcRect,DT_CALCRECT); } else if(index == CCommentView::NO){ -- 2.11.0