ダブルクリック処理にやや難有り

diff --git a/nlite.suo b/nlite.suo
index 50f287c..53917da 100644 (file)
Binary files a/nlite.suo and b/nlite.suo differ

diff --git a/nlite/nlite_commentview.cpp b/nlite/nlite_commentview.cpp
index 51c276c..1f0e4c8 100644 (file)
--- a/nlite/nlite_commentview.cpp
+++ b/nlite/nlite_commentview.cpp
@@ -547,15 +547,16 @@ namespace nlite{
 
 
                if(scrollFlag == TRUE){
-                       this->PostMessage(WM_VSCROLL,MAKEWORD(SB_BOTTOM,0),0);
+                       this->SendMessage(WM_VSCROLL,MAKEWORD(SB_BOTTOM,0),0);
                }
 
 
                if(vScrollInfo.nPos + static_cast<INT_PTR>(vScrollInfo.nPage) >= vScrollInfo.nMax - static_cast<INT_PTR>(vScrollInfo.nPage)){
-                       m_commentListWindow.Invalidate();
+                       
                        this->Invalidate();
                        
-                       this->m_commentListWindow.PostMessage(UM_COMMENTVIEW_SETCTRL,NULL,NULL);
+                       this->m_commentListWindow.SendMessageW(UM_COMMENTVIEW_SETCTRL,NULL,NULL);
+                       this->UpdateWindow();
                }
 
                return;
@@ -567,16 +568,6 @@ namespace nlite{
                return rgb;
        }
 
-
-
-
-
-
-
-
-
-
-
        LRESULT CCommentView::OnSize(UINT wParam,SIZE lParam){
                ChangeSize(lParam);
 
@@ -725,7 +716,6 @@ namespace nlite{
 
                        EndDeferWindowPos(hDwp);
 
-
                        this->SetScrollInfo(SB_HORZ,&hScrollInfo);
                }
 
@@ -802,13 +792,10 @@ namespace nlite{
                if(dy != 0){
 
                        vScrollInfo.nPos += dy;
-                       //              viewStartHeight = vScrollInfo.nPos;
                        this->SetScrollPos(SB_VERT,vScrollInfo.nPos);
                        this->commentlist.SetShortCut(this->GetScrollPos(SB_VERT));
-                       //this->SetScrollInfo(SB_VERT,&vScrollInfo);
+                       this->Invalidate();
                        this->UpdateWindow();
-                       
-                       m_commentListWindow.Invalidate();
                        this->m_commentListWindow.SendMessage(UM_COMMENTVIEW_SETCTRL,NULL,NULL);        
                }
 
@@ -821,8 +808,6 @@ namespace nlite{
                m_header.Create(m_hWnd,0,WC_HEADER,WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN   | HDS_BUTTONS | HDS_HOTTRACK |HDS_DRAGDROP | HDS_FULLDRAG  ,0,commentViewConstant::HEADER_ID);
                m_commentListWindow.Create(m_hWnd,0,commentViewConstant::NLITE_COMMENTLISTWINDOW,WS_CHILD | WS_VISIBLE  | WS_CLIPCHILDREN  , 0,commentViewConstant::LISTWINDOW);
 
-
-
                return 0;
        }
 
@@ -1009,7 +994,6 @@ namespace nlite{
                                for(;chatData != endData && listRect.top < clientRect.bottom;++chatData){
                                        CalcItemHeight(*chatData);
 
-//                                     dumpln(TEXT("height:%d"),chatData->viewData.height);
                                        listRect.bottom += chatData->viewData.height;
 
                                        headerRects[CCommentView::NO].top = listRect.top + SELL_SPACE_LENGTH;
@@ -1136,10 +1120,6 @@ namespace nlite{
 
                        }
                }
-               /*
-               vScrollInfo.fMask = SIF_RANGE;
-               self.GetScrollInfo(SB_VERT,&vScrollInfo);
-               */
                rslt = nMax+ 1;
 
 
@@ -1155,7 +1135,7 @@ overclientrect:
                RECT userNameViewRect = headerRect[CCommentView::USERNAME];                                                     //\83\86\81[\83U\96¼\95\\8e¦\97Ì\88æ
                RECT chatViewRect = headerRect[CCommentView::COMMENT];                                                          //\83R\83\81\83\93\83g\95\\8e¦\97Ì\88æ
                RECT timeViewRect = headerRect[CCommentView::TIME];                                                                     //\8e\9e\8aÔ\95\\8e¦\97Ì\88æ  
-               RECT infoViewRect  = headerRect[CCommentView::INFO];                                                                    //\83R\83\81\83\93\83g\8fî\95ñ\95\\8e¦\97Ì\88æ
+               RECT infoViewRect  = headerRect[CCommentView::INFO];                                                            //\83R\83\81\83\93\83g\8fî\95ñ\95\\8e¦\97Ì\88æ
 
 
                //
@@ -1394,7 +1374,10 @@ end:
                                        }
                                        rc.bottom = rc.top +  calcRect.bottom - calcRect.top;
                                        rc.right = rc.right > rc.left + calcRect.right - calcRect.left ? rc.left + calcRect.right - calcRect.left : rc.right;
-                                       rslt = (point.y >= rc.top && point.y <= rc.bottom && point.x >= rc.left && point.x <= rc.right);
+                                       
+                                       //\8dÀ\95W\82ª\83\8a\83\93\83N\91Î\8fÛ\95¶\8e\9a\97ñ\93à\82É\82 \82é\8fê\8d\87\82Ítrue\82ð\90Ý\92è\82·\82é
+                                       rslt = (point.y >= rc.top && point.y <= rc.bottom && point.x >= rc.left && point.x <= rc.right) &&
+                                               ((index ==CCommentView::NO && clickData->no != 0) ||index ==CCommentView::USERNAME);
                                        
                                        break;
 
@@ -1449,9 +1432,9 @@ end:
        VOID CCommentListWindow::OnLButtonDblClk(UINT wParam, _WTYPES_NS::CPoint &point){
 
 
-
                if(!(point.x > (INT_PTR)self.GetColumnHolSizeSum() || self.commentlist.empty() == TRUE)){
                
+
                        auto end  = self.commentlist.end();
                        auto lineIte = CalcClickLine(point.y);
                        if( lineIte == end)goto  endlabel;

diff --git a/nlite/stdafx.h b/nlite/stdafx.h
index 9ca4bf1..4954d9e 100644 (file)
--- a/nlite/stdafx.h
+++ b/nlite/stdafx.h
@@ -11,7 +11,7 @@
 #define WIN32_LEAN_AND_MEAN                                    // Windows \83w\83b\83_\81[\82©\82ç\8eg\97p\82³\82ê\82Ä\82¢\82È\82¢\95\94\95ª\82ð\8f\9c\8aO\82µ\82Ü\82·\81B
 #define _CRT_SECURE_NO_WARNINGS 1                      //vc++\82Ì\82¨\82¹\82Á\82©\82¢\82È\8cx\8d\90\82ð\8fÁ\82·
 #define  _CRT_NON_CONFORMING_SWPRINTFS 1       //vc++\82Ì\82¨\82¹\82Á\82©\82¢\82È\8cx\8d\90\82ð\8fÁ\82·
-//#define USE_STUB                                                     //\83X\83^\83u\82ð\8eg\97p\82·\82é\8fê\8d\87\82Í\83R\83\81\83\93\83g\83A\83E\83g\82ð\89ð\8f\9c\82·\82é
+#define USE_STUB                                                       //\83X\83^\83u\82ð\8eg\97p\82·\82é\8fê\8d\87\82Í\83R\83\81\83\93\83g\83A\83E\83g\82ð\89ð\8f\9c\82·\82é
 #define WINDEBUGER_NOPRINTING                          //\83f\83o\83b\83O\8fo\97Í\82ð\83R\83\93\83\\81[\83\8b\82É\95\\8e¦\82µ\82½\82­\82È\82¢\8fê\8d\87\92è\8b`\82·\82é
 #define _WTL_NO_CSTRING
 

diff --git a/nlite_stub/nlib_stub.h b/nlite_stub/nlib_stub.h
index 036bddf..c592a17 100644 (file)
--- a/nlite_stub/nlib_stub.h
+++ b/nlite_stub/nlib_stub.h
@@ -30,6 +30,6 @@ typedef struct nicolivestream_t{
 
 #define STARTRECEVECOUNT 1000
 
-#define RECEVECOUNT 1
+#define RECEVECOUNT 65536
 
 #define ONERECEVECHATCOUNT 3
\ No newline at end of file

diff --git a/nlite_stub/nlite_stub.cpp b/nlite_stub/nlite_stub.cpp
index 981d6f6..01cb47b 100644 (file)
--- a/nlite_stub/nlite_stub.cpp
+++ b/nlite_stub/nlite_stub.cpp
@@ -162,6 +162,12 @@ VOID NicoLiveStrream_setResFrom(NicoLiveStream_P self,INT_PTR res){
        return;
 }
 
+
+NLIB_RESULT NicoLiveStream_sendOwnerChat(NicoLiveStream_P self,LPCTSTR chatbuf,LPCTSTR *mail,LPCTSTR *extends){
+
+       return NLIB_ERR_OK;
+}
+
 unsigned int WINAPI commentthread(VOID *usadata){
 
        NicoLiveStream_P self = (NicoLiveStream_P)usadata;