From 5e1c86a0f4703d256979de04d065dff9a84fd3be Mon Sep 17 00:00:00 2001 From: qwerty2501 Date: Wed, 8 Feb 2012 22:10:08 +0900 Subject: [PATCH] =?utf8?q?=E3=83=AC=E3=82=B9=E6=A9=9F=E8=83=BD=E8=BF=BD?= =?utf8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- nlite.suo | Bin 161280 -> 163328 bytes nlite/nlite.h | 2 ++ nlite/nlite_commentWrite.cpp | 13 +++++++++++++ nlite/nlite_commentWrite.h | 5 +++++ nlite/nlite_commentview.cpp | 31 +++++++++++++++++++++++++++++-- nlite/nlite_commentview.h | 14 +++++++++++++- nlite/nlite_mainframe.cpp | 16 ++++++++++++++++ nlite/nlite_mainframe.h | 13 +++++++++++++ 8 files changed, 91 insertions(+), 3 deletions(-) diff --git a/nlite.suo b/nlite.suo index 69374992853b7c1beadaafb5d9f1fcd5c26c92c8..8195887bc98b10ef040a30f864b8471dfac43ef4 100644 GIT binary patch delta 5192 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 delta 4906 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.SetWindowText(lpStr); + if(rslt == TRUE){ + commentSubEdit.SetFocus(); + int cursor = commentSubEdit.GetWindowTextLength(); + commentSubEdit.SetSel(cursor,cursor); + //commentSubEdit.ShowCaret(); + } + return rslt; +} + VOID CCommentWriteWindow::OnChatReceveStart(CNicoLiveStream &nicoLiveStream,NicoLiveThreadComment_P threadComment){ this->ShowWindow(SW_HIDE); diff --git a/nlite/nlite_commentWrite.h b/nlite/nlite_commentWrite.h index a89ca45..f3b14f4 100644 --- a/nlite/nlite_commentWrite.h +++ b/nlite/nlite_commentWrite.h @@ -164,6 +164,11 @@ namespace nlite{ BOOL SendChat(); /// + ///ƒRƒƒ“ƒg‘—M—“‚É•¶Žš—ñ‚ðÝ’è + /// + BOOL SetText(LPCTSTR lpStr); + + /// ///ƒRƒƒ“ƒgŽóMŠJŽnŽž‚̏ˆ— /// VOID OnChatReceveStart(CNicoLiveStream &nicoLiveStream,NicoLiveThreadComment_P threadComment); diff --git a/nlite/nlite_commentview.cpp b/nlite/nlite_commentview.cpp index ce80038..a6a1014 100644 --- a/nlite/nlite_commentview.cpp +++ b/nlite/nlite_commentview.cpp @@ -614,6 +614,24 @@ namespace nlite{ } + + LRESULT CCommentView::OnClickChatNo(UINT uMsg,WPARAM wParam,LPARAM lParam){ + + + ::SendMessage(::GetAncestor(*this,GA_ROOT),uMsg,wParam,lParam); + wincheck(GetLastError()); + return 0; + } + + + LRESULT CCommentView::OnClickUserName(UINT uMsg,WPARAM wParam,LPARAM lParam){ + + + ::SendMessage(::GetAncestor(*this,GA_ROOT),uMsg,wParam,lParam); + + return 0; + } + LRESULT CCommentView::OnEraseBkgnd(HDC wParam){ return TRUE; @@ -1397,15 +1415,24 @@ end: - + CCommentList::iterator ite; this->SetFocus(); if(point.x > (INT_PTR)self.GetColumnHolSizeSum()) goto end; if(self.commentlist.empty() == TRUE)goto end; - self.commentlist.SetCurSel(CalcClickLine(point.y)); + ite = CalcClickLine(point.y); + self.commentlist.SetCurSel(ite); + if(this->IsOnNoOrUserName(CCommentView::NO,point) == TRUE){ + + ::SendMessage(self,UM_CLICK_CHATNO,(WPARAM)&(*ite),(LPARAM)self.m_hWnd); + + } else if(this->IsOnNoOrUserName(CCommentView::USERNAME,point) == TRUE){ + + ::SendMessage(self,UM_CLICK_USERNAME,(WPARAM)&(*ite),(LPARAM)self.m_hWnd); + } diff --git a/nlite/nlite_commentview.h b/nlite/nlite_commentview.h index 48720a8..4d60a70 100644 --- a/nlite/nlite_commentview.h +++ b/nlite/nlite_commentview.h @@ -359,7 +359,6 @@ namespace nlite{ CommentViewProperty viewproperty; //•\Ž¦ƒvƒƒpƒeƒB HFONT hHeaderFontNew; //ƒwƒbƒ_[ƒtƒHƒ“ƒg CNicoVideoAuth &refAuth; //ƒjƒRƒjƒR¶•ú‘—”FØƒIƒuƒWƒFƒNƒgŽQÆ - CChatChildCtrlsList chatChildCtrlsList; @@ -406,6 +405,8 @@ namespace nlite{ MSG_WM_SIZE(OnSize) MSG_WM_HSCROLL(OnHScroll) MSG_WM_VSCROLL(OnVScroll) + MESSAGE_HANDLER_EX(UM_CLICK_CHATNO,OnClickChatNo) + MESSAGE_HANDLER_EX(UM_CLICK_USERNAME,OnClickUserName) MSG_WM_ERASEBKGND(OnEraseBkgnd) NOTIFY_CODE_HANDLER_EX(HDN_ENDTRACK ,OnHeaderEndTrack) NOTIFY_CODE_HANDLER_EX(HDN_ENDDRAG ,OnHeaderEndDrag) @@ -480,6 +481,17 @@ namespace nlite{ + /// + ///ƒrƒ…[ƒA‚É•\Ž¦‚³‚ê‚Ä‚¢‚éƒRƒ”Ô‚ªƒNƒŠƒbƒN‚³‚ꂽŽž‚̏ˆ— + /// + LRESULT OnClickChatNo(UINT uMsg,WPARAM wParam,LPARAM lParam); + + + /// + ///ƒrƒ…[ƒA‚É•\Ž¦‚³‚ê‚Ä‚¢‚郆[ƒU–¼‚ªƒNƒŠƒbƒN‚³‚ꂽŽž‚̏ˆ— + /// + LRESULT OnClickUserName(UINT uMsg,WPARAM wParam,LPARAM lParam); + /// ///”wŒi“h‚è‚‚Ԃµˆ— diff --git a/nlite/nlite_mainframe.cpp b/nlite/nlite_mainframe.cpp index 17596c3..ff13f7b 100644 --- a/nlite/nlite_mainframe.cpp +++ b/nlite/nlite_mainframe.cpp @@ -409,7 +409,23 @@ LRESULT CNliteMainFrame::OnRbnHeightChange(INT_PTR wParam,LPNMHDR lParam,BOOL &b return 0; } +LRESULT CNliteMainFrame::OnClickChatNo(UINT uMsg,WPARAM wParam,LPARAM lParam){ + auto &chatData = *(CChatData*)wParam; + CString setString; + setString.Format(TEXT(">>%d "),chatData.no); + + this->commentWriteWindow.SetText(setString); + + return 0; + +} + +LRESULT CNliteMainFrame::OnClickUserName(UINT uMsg,WPARAM wParam,LPARAM lParam){ + + + return 0; +} NLIB_RESULT CNliteMainFrame::LiveCallBack(NICOLIVE_EVENT eventType,NicoLiveStream_P pNicoLiveStream,LPVOID option,NICOLIVE_PARAM param1,NICOLIVE_PARAM param2){ diff --git a/nlite/nlite_mainframe.h b/nlite/nlite_mainframe.h index 901166b..56fd5ce 100644 --- a/nlite/nlite_mainframe.h +++ b/nlite/nlite_mainframe.h @@ -224,6 +224,8 @@ namespace nlite{ MESSAGE_HANDLER(WM_SIZE,OnSize) MSG_WM_SIZING(OnSizing) MESSAGE_HANDLER(WM_SETCURSOR,OnSetCursor) + MESSAGE_HANDLER_EX(UM_CLICK_CHATNO,OnClickChatNo) + MESSAGE_HANDLER_EX(UM_CLICK_USERNAME,OnClickUserName) COMMAND_ID_HANDLER_EX(IDM_EXIT, OnMenuExit) COMMAND_ID_HANDLER_EX(IDM_ABOUT,OnMenuAbount) COMMAND_ID_HANDLER_EX(IDM_COOKIE,OnCookie) @@ -268,7 +270,18 @@ namespace nlite{ /// LRESULT OnRbnHeightChange(INT_PTR wParam,LPNMHDR lParam,BOOL &bHandled); + /// + ///ƒrƒ…[ƒA‚É•\Ž¦‚³‚ê‚Ä‚¢‚éƒRƒ”Ô‚ªƒNƒŠƒbƒN‚³‚ꂽŽž‚̏ˆ— + /// + LRESULT OnClickChatNo(UINT uMsg,WPARAM wParam,LPARAM lParam); + + /// + ///ƒrƒ…[ƒA‚É•\Ž¦‚³‚ê‚Ä‚¢‚郆[ƒU–¼‚ªƒNƒŠƒbƒN‚³‚ꂽŽž‚̏ˆ— + /// + LRESULT OnClickUserName(UINT uMsg,WPARAM wParam,LPARAM lParam); + + /// ///ƒTƒCƒY•ÏX’†ˆ— /// -- 2.11.0