2012/01/08 20:24:24

diff --git a/nlite.suo b/nlite.suo
index efc2916..2a802ab 100644 (file)
Binary files a/nlite.suo and b/nlite.suo differ

diff --git a/nlite/nlite_commentWrite.h b/nlite/nlite_commentWrite.h
index ddb2255..067072e 100644 (file)
--- a/nlite/nlite_commentWrite.h
+++ b/nlite/nlite_commentWrite.h
@@ -82,7 +82,7 @@ namespace nlite{
                        anonymousButton.MoveWindow((SEPARATEFSIZE.left * 4) + (SEPARATEFSIZE.right * 3) + commentPosBoxSize.cx + commentSizeBoxSize.cx + commentColorBoxSize.cx ,SEPARATEFSIZE.top,commentAnonymousButtonSize.cx,commentWriteWindowSize.cy - (SEPARATEFSIZE.top + SEPARATEFSIZE.bottom),TRUE);
                        comment.MoveWindow((SEPARATEFSIZE.left * 5) + (SEPARATEFSIZE.right * 4) + commentPosBoxSize.cx + commentSizeBoxSize.cx + commentColorBoxSize.cx + commentAnonymousButtonSize.cx,SEPARATEFSIZE.top,size.cx - (SEPARATEFSIZE.left + (SEPARATEFSIZE.right * 2) + commentWriteButtonSize.cx + ((SEPARATEFSIZE.left * 5) + (SEPARATEFSIZE.right * 4) + commentPosBoxSize.cx + commentSizeBoxSize.cx + commentColorBoxSize.cx + commentAnonymousButtonSize.cx)),commentWriteWindowSize.cy - (SEPARATEFSIZE.top + SEPARATEFSIZE.bottom),TRUE);
                        commentWriteButton.MoveWindow(size.cx - (SEPARATEFSIZE.left + SEPARATEFSIZE.right + commentWriteButtonSize.cx),SEPARATEFSIZE.top,commentWriteButtonSize.cx - SEPARATEFSIZE.right,commentWriteWindowSize.cy - (SEPARATEFSIZE.top + SEPARATEFSIZE.bottom),TRUE);
-
+                       
                        return;
                }
        };

diff --git a/nlite/nlite_commentview.cpp b/nlite/nlite_commentview.cpp
index e0155e8..c355440 100644 (file)
--- a/nlite/nlite_commentview.cpp
+++ b/nlite/nlite_commentview.cpp
@@ -73,10 +73,9 @@ HWND CCommentView::Create(HWND hWndParent){
 
 VOID CCommentView::OnHeaderItemChanged(){
 
-       RECT headerSizeRect;
-       header.GetClientRect(&headerSizeRect);
        
-       Lock();
+       
+       
        
        INT_PTR curSel = listBox.GetCurSel();
 
@@ -87,14 +86,13 @@ VOID CCommentView::OnHeaderItemChanged(){
        BOOL scrollFlag = scrollInfo.nPos + (int)scrollInfo.nPage >= scrollInfo.nMax;
        UINT_PTR commentCount = commentlist.Size();
 
-       timer_set(resize);
-       timer_start(resize);
-
+       
+       listBox.SetRedraw(FALSE);
        listBox.ResetContent();
        for(UINT_PTR index =0;index < commentCount;index++){
                listBox.AddString((LPCTSTR)&commentlist.GetChatAt(index));
        }
-       timer_end(resize);
+       
 
        
 
@@ -111,7 +109,7 @@ VOID CCommentView::OnHeaderItemChanged(){
                listBox.SendMessageW(WM_VSCROLL,SB_BOTTOM,0);
        }
        
-       Unlock();
+       
        
 
 }

diff --git a/nlite/nlite_listviewex.h b/nlite/nlite_listviewex.h
index 6b348a1..840829c 100644 (file)
--- a/nlite/nlite_listviewex.h
+++ b/nlite/nlite_listviewex.h
@@ -41,7 +41,8 @@ namespace nlite{
                const UINT headerID;
                const UINT listBoxID;
                HFONT hHeaderFontNew;
-               UINT_PTR horizonSize;
+               SCROLLINFO hScrollInfo;
+
                
        public:
 
@@ -49,15 +50,16 @@ namespace nlite{
                        headerID(NLITE_HEADER_ID),
                        listBoxID(NLITE_LIST_ID),
                        t((TBase*)this),
-                       horizonSize(0)
+                       hScrollInfo()
                        {
-
-                       LOGFONT lf = {0};
-                       lf.lfHeight = 10;
-                       lf.lfCharSet = SHIFTJIS_CHARSET;
+                               hScrollInfo.fMask = SIF_ALL;
+                               hScrollInfo.cbSize = sizeof(hScrollInfo);
+                               LOGFONT lf = {0};
+                               lf.lfHeight = 10;
+                               lf.lfCharSet = SHIFTJIS_CHARSET;
 
 
-                       hHeaderFontNew = CreateFontIndirect(&lf);
+                               hHeaderFontNew = CreateFontIndirect(&lf);
 
 
                }
@@ -68,8 +70,8 @@ namespace nlite{
 
                }
 
-               DECLARE_WND_CLASS(LISTVIEW_EX)
-
+               
+               DECLARE_WND_CLASS_EX(LISTVIEW_EX,0,COLOR_BACKGROUND)
                //\83\81\83b\83Z\81[\83W\83}\83b\83v
                BEGIN_MSG_MAP(tn)
                        MSG_WM_CREATE(OnCreate)
@@ -78,13 +80,33 @@ namespace nlite{
                        MSG_WM_MEASUREITEM(OnMersureItem)
                        MSG_WM_SIZING(OnSizing)
                        MSG_WM_SIZE(OnSize)
+                       MSG_WM_PAINT(OnPaint)
+                       MSG_WM_HSCROLL(OnHScroll)
                        MSG_WM_ERASEBKGND(OnEraseBkgnd)
                        COMMAND_CODE_HANDLER_EX(LBN_DBLCLK,OnListBoxDoubleClick)
                        NOTIFY_CODE_HANDLER_EX(HDN_ITEMCHANGED  ,OnheaderItemChanged)
                        NOTIFY_CODE_HANDLER_EX(HDN_ENDDRAG ,OnHeaderEndDrag)
                END_MSG_MAP()
 
-       
+               
+               ///
+               ///\94w\8ci\95`\89æ\8f\88\97\9d
+               ///
+               VOID OnPaint(HDC wParam){
+                       PAINTSTRUCT paintStruct;
+                       HDC paintDC = this->BeginPaint(&paintStruct);
+                       HPEN hPen = (HPEN)GetStockPen(NULL_PEN);
+                       HPEN oldPen = (HPEN)::SelectObject(paintDC,hPen);
+                       HBRUSH brush = (HBRUSH)GetStockObject(LTGRAY_BRUSH);
+                       HBRUSH oldBrush = (HBRUSH)::SelectObject(paintDC,brush);
+
+                       ::Rectangle(paintDC,paintStruct.rcPaint.left,paintStruct.rcPaint.top,paintStruct.rcPaint.right,paintStruct.rcPaint.bottom);
+                       this->EndPaint(&paintStruct);
+                       ::SelectObject(paintDC,oldBrush);
+                       ::SelectObject(paintDC,oldPen);
+                       
+                       return;
+               }
                        
                //\83T\83C\83Y\95Ï\8dX\92\86
                VOID OnSizing(UINT wParam,LPRECT lParam){
@@ -108,11 +130,13 @@ namespace nlite{
 
                //\83T\83C\83Y\95Ï\8dX\8f\88\97\9d
                VOID ChangeSize(const SIZE& client){
-
-                       header.MoveWindow(0 , 0,client.cx , headerHaight );
-                       listBox.MoveWindow(0,headerHaight,client.cx,client.cy - headerHaight);
-
-               
+                       listBox.MoveWindow(0,headerHaight,hScrollInfo.nMax,client.cy - headerHaight);
+                       hScrollInfo.nPage = client.cx;
+                       this->SetScrollInfo(SB_HORZ,&hScrollInfo);
+                       RECT bkRect = {0};
+                       bkRect.right = client.cx - hScrollInfo.nMax;
+                       bkRect.bottom = client.cy;
+                       this->InvalidateRect(&bkRect);
 
                        return;
                }
@@ -137,6 +161,19 @@ namespace nlite{
                        if(lParam->hwndFrom == header.m_hWnd){
 
                                t->OnHeaderItemChanged();
+
+                               INT_PTR itemCount = header.GetItemCount();
+                               RECT itemSizeRect;
+                               hScrollInfo.nMax = 0;
+                               for(INT_PTR imtemIndex = 0;imtemIndex < itemCount;imtemIndex++){
+                                       header.GetItemRect(imtemIndex,&itemSizeRect);
+                                       hScrollInfo.nMax += itemSizeRect.right - itemSizeRect.left;
+
+                               }
+
+                               this->SetScrollInfo(SB_HORZ,&hScrollInfo,TRUE);
+                               DecisionHorzSize();
+                               
                        }
 
                        return 0;
@@ -156,8 +193,6 @@ namespace nlite{
 
                LRESULT OnListBoxDoubleClick(UINT uNotifyCode, int nID, CWindow wndCtl){
 
-
-               
                        if(wndCtl.m_hWnd == listBox.m_hWnd){
 
                                t->OnListBoxDoubleClick();
@@ -166,8 +201,62 @@ namespace nlite{
                        return 0;
                }
 
+               ///
+               ///\89¡\83X\83N\83\8d\81[\83\8b\8e\9e\82Ì\8f\88\97\9d
+               ///
+               VOID OnHScroll(INT_PTR loWParam,SHORT hiWParam,HWND lParam){
+
+                       
+                       INT_PTR dy;
+                       switch(loWParam){
+
+                       case SB_THUMBTRACK:
+                               dy = hiWParam - hScrollInfo.nPos;
+                               break;
+
+                       default:
+                               dy = 0;
+                               break;
+
+                       }
                        
 
+                       hScrollInfo.nPos += dy;
+                       RECT headerPosRect;
+                       RECT listBoxPosRect;
+                       header.GetWindowRect(&headerPosRect);
+                       listBox.GetWindowRect(&listBoxPosRect);
+                       INT_PTR moveRange = -(hScrollInfo.nPos);
+                       headerPosRect.bottom -= headerPosRect.top;
+                       headerPosRect.top = 0;
+                       headerPosRect.right += moveRange - headerPosRect.left;
+                       headerPosRect.left = moveRange;
+                                       
+                       listBoxPosRect.bottom -= (listBoxPosRect.top - headerHaight);
+                       listBoxPosRect.top = headerHaight;
+                       listBoxPosRect.right += moveRange - listBoxPosRect.left;
+                       listBoxPosRect.left = moveRange;
+                       
+                       header.MoveWindow(&headerPosRect);
+                       listBox.MoveWindow(&listBoxPosRect);
+                                       
+                               
+                                       
+
+                       HDWP hDwp = BeginDeferWindowPos(2);
+
+                       header.DeferWindowPos(hDwp,header.m_hWnd,headerPosRect.left,headerPosRect.top,headerPosRect.right,headerPosRect.bottom,SWP_NOSIZE | SWP_NOZORDER);
+                       listBox.DeferWindowPos(hDwp,listBox.m_hWnd,listBoxPosRect.left,listBoxPosRect.top,listBoxPosRect.right,listBoxPosRect.bottom,SWP_NOSIZE | SWP_NOZORDER);                
+
+                       EndDeferWindowPos(hDwp);
+                                       
+                                       
+                       this->SetScrollInfo(SB_HORZ,&hScrollInfo);
+
+                       
+                       return;
+               }
+
                LRESULT OnCreate(LPCREATESTRUCT lpcs){
                        header.Create(m_hWnd,0,WC_HEADER,WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN   | HDS_BUTTONS | HDS_HOTTRACK |HDS_DRAGDROP | HDS_FULLDRAG  ,0,headerID);
                        listBox.Create(m_hWnd,0,WC_LISTBOX,WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_CLIPCHILDREN   | LBS_OWNERDRAWVARIABLE | LBS_NOTIFY | LBS_NOREDRAW  ,0,listBoxID);
@@ -186,7 +275,7 @@ namespace nlite{
 
                }
 
-               UINT_PTR AddHeader(LPHEADERSINFO infos){
+               VOID AddHeader(LPHEADERSINFO infos){
 
 
                        header.SetFont(hHeaderFontNew);
@@ -195,24 +284,36 @@ namespace nlite{
                        item.mask = HDI_FORMAT | HDI_TEXT | HDI_WIDTH;
                        item.fmt = HDF_CENTER | HDF_STRING;
                        
+                       
                        for(UINT_PTR index = 0;index < infos->count ;++index){
 
                                item.pszText = infos->columns[index];
 
                                item.cxy =  infos->holizensize[index];
-                               horizonSize += infos->holizensize[index];
+                               hScrollInfo.nMax += infos->holizensize[index];
                                header.InsertItem(index,&item);
                        }
                        
-                       
-                       SCROLLINFO scrollInfo = {0};
-                       scrollInfo.fMask =  SIF_RANGE | SIF_POS;
-                       scrollInfo.nMax = horizonSize;
-       
-       
-                       this->SetScrollInfo(SB_HORZ,&scrollInfo,TRUE);  
+                       this->SetScrollInfo(SB_HORZ,&hScrollInfo,TRUE); 
+                       DecisionHorzSize();
+                       return;
+               }
+
+               VOID DecisionHorzSize(){
 
-                       return horizonSize;
+                       
+                       HDWP hWindowPosInfo = BeginDeferWindowPos(2);
+                       RECT bkWindowRect;
+                       this->GetClientRect(&bkWindowRect);
+                       header.DeferWindowPos(hWindowPosInfo,header.m_hWnd,0,0,hScrollInfo.nMax,headerHaight,SWP_NOZORDER | SWP_NOMOVE);
+                       listBox.DeferWindowPos(hWindowPosInfo,header.m_hWnd,0,0,hScrollInfo.nMax,bkWindowRect.bottom - headerHaight,SWP_NOZORDER | SWP_NOMOVE);
+
+                       EndDeferWindowPos(hWindowPosInfo);
+                       bkWindowRect.left = hScrollInfo.nMax;
+                       
+                       this->InvalidateRect(&bkWindowRect);
+                       
+                       return;
                }
 
                VOID OnMersureItem(UINT wParam, LPMEASUREITEMSTRUCT lParam){