From 4a4e87188ef039ebc6b6adf4376ccdcfd1e16919 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 14 Feb 2012 09:42:33 +0900 Subject: [PATCH] =?utf8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88=E6=9B=B8?= =?utf8?q?=E3=81=8D=E8=BE=BC=E3=81=BF=E6=99=82=E3=81=AE=E3=83=9E=E3=82=A6?= =?utf8?q?=E3=82=B9=E7=A0=82=E6=99=82=E8=A8=88=E5=87=A6=E7=90=86=E3=82=92?= =?utf8?q?=E5=AE=9F=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- nlite.suo | Bin 166400 -> 164352 bytes nlite/nlite_commentWrite.cpp | 21 +++++++++++---------- nlite/nlite_commentWrite.h | 8 +++++++- nlite/nlite_mainframe.cpp | 14 +++++++++++--- 4 files changed, 29 insertions(+), 14 deletions(-) diff --git a/nlite.suo b/nlite.suo index 4e1fe017eb839f06602f092ae074d2d9a27b7f2a..8d82c60e9098591ea31c23fd45d3b37dfb678f3a 100644 GIT binary patch delta 5128 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 delta 5464 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 Wvd}izglJeUv`s}^-*~Z?>Hh!?o)<9y diff --git a/nlite/nlite_commentWrite.cpp b/nlite/nlite_commentWrite.cpp index 2752b0c..9843313 100644 --- a/nlite/nlite_commentWrite.cpp +++ b/nlite/nlite_commentWrite.cpp @@ -127,6 +127,12 @@ streamTime(0) {} +BOOL CCommentWriteWindow::IsWrighthing(){ + + return this->commentSubEdit.untilConnectingFlag; + +} + UINT_PTR CCommentWriteWindow::GetHeight(){ return commentWriteHeight + infoDispHeight - COMMENTWRITEWINDOW_SEPARATEFSIZE.top; @@ -277,6 +283,7 @@ VOID CCommentWriteWindow::OnPaint(HDC hdc){ VOID CSubChatEdit::EnterChatBox(LPVOID userData){ + auto owner = ((CSubChatEdit*)userData)->self; auto &self = *((CSubChatEdit*)userData); CCommentMaker commentMaker; @@ -359,21 +366,15 @@ end: - if((owner.nicoLiveStream.IsOwner())){ - - Sleep(1000); - - }else { - Sleep(3000); - } - ((CSubChatEdit*)userData)->AgreeEnter(); + + self.AgreeEnter(); _endthread(); return; } BOOL CCommentWriteWindow::SendChat(){ - + this->commentSubEdit.untilConnectingFlag = TRUE; this->commentSubEdit.SetReadOnly(TRUE); _beginthread(CSubChatEdit::EnterChatBox,0,&this->commentSubEdit); @@ -730,7 +731,7 @@ void CSubChatEdit::OnKeyDown(TCHAR wParam, UINT upLParam,UINT loLParam){ cs.Lock(); if(untilConnectingFlag == FALSE){ - untilConnectingFlag = TRUE; + self.SendChat(); diff --git a/nlite/nlite_commentWrite.h b/nlite/nlite_commentWrite.h index 2bb518a..f50c5a0 100644 --- a/nlite/nlite_commentWrite.h +++ b/nlite/nlite_commentWrite.h @@ -60,7 +60,7 @@ namespace nlite{ class CCommentWriteWindow; class CSubChatEdit:public CWindowImpl{ - + friend CCommentWriteWindow; private: @@ -157,6 +157,12 @@ namespace nlite{ CCommentWriteWindow(CNicoLiveStream &nicoLiveStream); /// + ///Œ»Ý‘‚«ž‚ݏˆ—’†‚©‚̃tƒ‰ƒOŠm”F + /// + BOOL IsWrighthing(); + + + /// ///‚±‚̃EƒBƒ“ƒhƒE‚̍‚‚³‚ðŽæ“¾ /// UINT_PTR GetHeight(); diff --git a/nlite/nlite_mainframe.cpp b/nlite/nlite_mainframe.cpp index 11ecdbb..187fad2 100644 --- a/nlite/nlite_mainframe.cpp +++ b/nlite/nlite_mainframe.cpp @@ -546,12 +546,20 @@ LRESULT CNliteMainFrame::OnSetCursor(LRESULT msg,WPARAM wParam,LPARAM lParam,BOO BOOL rslt = FALSE; - if(this->subLiveNoComboBox.untilConnectingFlag == TRUE){ - ::SetCursor(::LoadCursorW(NULL,IDC_WAIT)); + if(this->subLiveNoComboBox.untilConnectingFlag == TRUE || this->commentWriteWindow.IsWrighthing() == TRUE){ + + if(this->subLiveNoComboBox.untilConnectingFlag == TRUE){ + ::SetCursor(::LoadCursorW(NULL,IDC_WAIT)); + } else if(this->commentWriteWindow.IsWrighthing() == TRUE){ + ::SetCursor(::LoadCursorW(NULL,IDC_APPSTARTING)); + } bHandled = TRUE; rslt = TRUE; - } else { + + + + } else { bHandled = FALSE; } -- 2.11.0