From 2083ab4dc9f24fd6c1b95295259da97e3a19081c Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 14 Feb 2012 15:44:32 +0900 Subject: [PATCH] =?utf8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88=E6=95=B4?= =?utf8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- nlite.suo | Bin 178688 -> 179200 bytes nlite/nlite_chatData.cpp | 15 +- nlite/nlite_commentWrite.cpp | 1130 +++++++++++++++++++++--------------------- nlite/nlite_commentview.cpp | 10 +- 4 files changed, 576 insertions(+), 579 deletions(-) diff --git a/nlite.suo b/nlite.suo index 3b39f78dae6f6c397138c01520c7f8c9d2428c23..50f287c6d1744eba64a094221807ecad238990ba 100644 GIT binary patch delta 5230 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 P*)2e?{_s8a2_gO;{Z1j1 delta 4990 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 pw&R-`@w8!N$2_($Qd;SdRyI* pWriter; CreateXmlWriter(__uuidof(IXmlWriter), reinterpret_cast(&pWriter), 0); - // t@CXg[ì¬ CComPtr pStream; SHCreateStreamOnFile(fileName, STGM_CREATE | STGM_WRITE, &pStream); @@ -396,6 +402,7 @@ BOOL CListenerList::WriteProperty(LPCTSTR fileName){ auto begin = m_listenerList.begin(); auto end = m_listenerList.end(); + //Xi[Xg©çÛ¶ÎÛÌf[^ÌÝxml`®ÅÛ¶ for(;begin != end;++begin){ if(begin->name.Length() > 0 || begin->nameColor != ListenerData::INIT_COLOR || begin->bgcolor != ListenerData::INIT_COLOR){ pWriter->WriteStartElement(NULL,TEXT("user"),NULL); diff --git a/nlite/nlite_commentWrite.cpp b/nlite/nlite_commentWrite.cpp index 9843313..a657ff0 100644 --- a/nlite/nlite_commentWrite.cpp +++ b/nlite/nlite_commentWrite.cpp @@ -4,752 +4,750 @@ namespace nlite{ -const static SIZE commentColorBoxSize = {35,0}; + const static SIZE commentColorBoxSize = {35,0}; //FèR{{bNXÌTCY + const static LPCTSTR ANONYMOUS_MAILCOMMAND = TEXT("184"); //184è¶ñ + const static LPCTSTR ANONYMOUS_BOTTONSTRING = ANONYMOUS_MAILCOMMAND; //184[R}hè¶ñ + const static LPCTSTR OWNERMODE_BOTTONSTRING = TEXT("åR"); //åRIð{^è¶ñ + const static LPCTSTR WRITE_BOTTONSTRING = TEXT("«Ý"); //«Ý{^è¶ñ + const static COLORREF OWNEREDITCOLOR = RGB(255,192,192); //åR«ÝGfBbgF + const static COLORREF NORMALEDITCOLOR = RGB(255,255,255); //Xi[Ì«ÝGfBbgF + const static RECT COMMENTWRITEWINDOW_SEPARATEFSIZE = {0,5,0,5}; //Rg«ÝEBhEÌãºXy[X + const static UINT_PTR COMMENTWRITEWINDOW_SIDESEPARATESIZE = 5; //¡Xy[X + const static UINT_PTR INIT_COMMENTWRITE_MAXLENGTH = 60; //ºL¶ñÅå· + const static UINT_PTR CHECKBUTTON_SUBSCRIPT_HEIGHT = 10; //Ið{^¶ñÌ³ + const static LPCTSTR DEFAULT_COMMENTCOLOR = TEXT("white"); //KèÌRgF + const static LPCTSTR DEFAULT_COMMENTSIZE = TEXT("medium"); //KèÌRg¶ñ + const static LPCTSTR DEFAULT_COMMENTPOS = TEXT("naka"); //KèÌRg\¦Êu + + + + namespace generalUser{ + const CommentColorInfo COMMENT_COLORLIST[] = { + {DEFAULT_COMMENTCOLOR,PALETTERGB(0xFF,0xFF,0xFF)}, // + {TEXT("red"),PALETTERGB(0xFF,0x00,0x00)}, //Ô + {TEXT("pink"),PALETTERGB(0xFF,0x80,0x80)}, //sN + {TEXT("orange"),PALETTERGB(0xFF,0xC0,0x00)}, //IW + {TEXT("yellow"),PALETTERGB(0xFF,0xFF,0x00)}, //©F + {TEXT("green"),PALETTERGB(0x00,0xFF,0x00)}, //Î + {TEXT("cyan"),PALETTERGB(0x00,0xFF,0xFF)}, //¦F + {TEXT("blue"),PALETTERGB(0x00,0x00,0xFF)}, //Â + {TEXT("purple"),PALETTERGB(0xC0,0x00,0xFF)}, // + + }; + + const CommentSizeInfo COMMENT_SIZELIST[] = { + {TEXT("Ê@"),DEFAULT_COMMENTSIZE}, //ÊTCY + {TEXT("¬@"),TEXT("small")} //¬TCY + }; + + + const CommentPosInfo COMMENT_POSLIST[] = { + {TEXT("Êí@"),DEFAULT_COMMENTPOS} //Êí\¦ + }; + } + + namespace premiumUser{ -const static LPCTSTR ANONYMOUS_MAILCOMMAND = TEXT("184"); -const static LPCTSTR ANONYMOUS_BOTTONSTRING = ANONYMOUS_MAILCOMMAND; -const static LPCTSTR OWNERMODE_BOTTONSTRING = TEXT("åR"); -const static LPCTSTR WRITE_BOTTONSTRING = TEXT("«Ý"); -const static LPCTSTR CHECKBUTTON_HIDDENSTRING = TEXT(" "); + const CommentColorInfo COMMENT_COLORLIST[] = { + {TEXT("black"),PALETTERGB(0x00,0x00,0x00)}, // + {TEXT("white2"),PALETTERGB(0xCC,0xCC,0x99)}, //»ÌQ + {TEXT("red2"),PALETTERGB(0xCC,0x00,0x33)}, //Ô»ÌQ + {TEXT("pink2"),PALETTERGB(0xFF,0x33,0xCC)}, //sN»ÌQ + {TEXT("orange2"),PALETTERGB(0xFF,0x66,0x00)}, //IW»ÌQ + {TEXT("yellow2"),PALETTERGB(0x99,0x99,0x00)}, //©F»ÌQ + {TEXT("green2"),PALETTERGB(0x00,0xCC,0x66)}, //Î»ÌQ + {TEXT("cyan2"),PALETTERGB(0x00,0xCC,0xCC)}, //¦F»ÌQ + {TEXT("blue2"),PALETTERGB(0x33,0x99,0xFF)}, //Â»ÌQ + {TEXT("purple2"),PALETTERGB(0x66,0x33,0xCC)} //»ÌQ + // {TEXT("black2"),PALETTERGB(0x66,0x66,0x66)} //»ÌQÍÈ¢H + }; + const CommentSizeInfo COMMENT_SIZELIST[] = { + {TEXT("å@"),TEXT("big")} //åTCY + }; -const static COLORREF OWNEREDITCOLOR = RGB(255,192,192); -const static COLORREF NORMALEDITCOLOR = RGB(255,255,255); -const static RECT COMMENTWRITEWINDOW_SEPARATEFSIZE = {0,5,0,5}; -const static UINT_PTR COMMENTWRITEWINDOW_SIDESEPARATESIZE = 5; -const static UINT_PTR INIT_COMMENTWRITE_MAXLENGTH = 60; -const static UINT_PTR CHECKBUTTON_SUBSCRIPT_HEIGHT = 10; -const static LPCTSTR DEFAULT_COMMENTCOLOR = TEXT("white"); -const static LPCTSTR DEFAULT_COMMENTSIZE = TEXT("medium"); -const static LPCTSTR DEFAULT_COMMENTPOS = TEXT("naka"); -const static COLORREF MAX_COLOR = 0xFFFFFF; + const CommentPosInfo COMMENT_POSLIST[] = { + {TEXT("º@"),TEXT("shita")}, //ºÉ\¦ + {TEXT("ã@"),TEXT("ue")} //ãÉ\¦ + }; + } + -namespace generalUser{ - const CommentColorInfo COMMENT_COLORLIST[] = { - {DEFAULT_COMMENTCOLOR,PALETTERGB(0xFF,0xFF,0xFF)}, // - {TEXT("red"),PALETTERGB(0xFF,0x00,0x00)}, //Ô - {TEXT("pink"),PALETTERGB(0xFF,0x80,0x80)}, //sN - {TEXT("orange"),PALETTERGB(0xFF,0xC0,0x00)}, //IW - {TEXT("yellow"),PALETTERGB(0xFF,0xFF,0x00)}, //©F - {TEXT("green"),PALETTERGB(0x00,0xFF,0x00)}, //Î - {TEXT("cyan"),PALETTERGB(0x00,0xFF,0xFF)}, //¦F - {TEXT("blue"),PALETTERGB(0x00,0x00,0xFF)}, //Â - {TEXT("purple"),PALETTERGB(0xC0,0x00,0xFF)}, // - - }; - const CommentSizeInfo COMMENT_SIZELIST[] = { - {TEXT("Ê@"),DEFAULT_COMMENTSIZE}, //ÊTCY - {TEXT("¬@"),TEXT("small")} //¬TCY - }; - const CommentPosInfo COMMENT_POSLIST[] = { - {TEXT("Êí@"),DEFAULT_COMMENTPOS} //Êí\¦ - }; -} + template + static VOID addItemList(CComboBox &combo,T * colorList,UINT_PTR length){ -namespace premiumUser{ + UINT_PTR startItemcount = combo.GetCount(); + length+= startItemcount; + for(UINT_PTR index = startItemcount; index < length;index++){ - const CommentColorInfo COMMENT_COLORLIST[] = { - {TEXT("black"),PALETTERGB(0x00,0x00,0x00)}, // - {TEXT("white2"),PALETTERGB(0xCC,0xCC,0x99)}, //»ÌQ - {TEXT("red2"),PALETTERGB(0xCC,0x00,0x33)}, //Ô»ÌQ - {TEXT("pink2"),PALETTERGB(0xFF,0x33,0xCC)}, //sN»ÌQ - {TEXT("orange2"),PALETTERGB(0xFF,0x66,0x00)}, //IW»ÌQ - {TEXT("yellow2"),PALETTERGB(0x99,0x99,0x00)}, //©F»ÌQ - {TEXT("green2"),PALETTERGB(0x00,0xCC,0x66)}, //Î»ÌQ - {TEXT("cyan2"),PALETTERGB(0x00,0xCC,0xCC)}, //¦F»ÌQ - {TEXT("blue2"),PALETTERGB(0x33,0x99,0xFF)}, //Â»ÌQ - {TEXT("purple2"),PALETTERGB(0x66,0x33,0xCC)} //»ÌQ - // {TEXT("black2"),PALETTERGB(0x66,0x66,0x66)} //»ÌQÍÈ¢H - }; + combo.AddString(colorList[index - startItemcount].name); + combo.SetItemDataPtr(index,(LPVOID)&colorList[index - startItemcount]); - const CommentSizeInfo COMMENT_SIZELIST[] = { - {TEXT("å@"),TEXT("big")} //åTCY - }; + } + return; + } - const CommentPosInfo COMMENT_POSLIST[] = { - {TEXT("º@"),TEXT("shita")}, //ºÉ\¦ - {TEXT("ã@"),TEXT("ue")} //ãÉ\¦ - }; -} + template + static UINT_PTR CalcComboBoxWidth(CComboBox &combo){ + CPaintDC pdc(combo); + SIZE size; + UINT_PTR rslt = 0; + UINT_PTR itemCount = combo.GetCount(); + LPCTSTR name; + for(UINT_PTR index = 0;index < itemCount;index++){ + name = ((T*)combo.GetItemDataPtr(index))->name; + ::GetTextExtentPoint32(pdc,name,_tcslen(name),&size); + rslt = rslt < (UINT_PTR)size.cx ? size.cx : rslt; + } + return rslt; + } + CCommentWriteWindow::CCommentWriteWindow(CNicoLiveStream &in_nicoLiveStream): + commentWriteHeight(0), + commentWriteInternalHeight(0), + commentWriteMaxLength(INIT_COMMENTWRITE_MAXLENGTH), + nicoLiveStream(in_nicoLiveStream), + commentSubEdit(*this), + streamTime(0) + {} -template -static VOID addItemList(CComboBox &combo,T * colorList,UINT_PTR length){ - UINT_PTR startItemcount = combo.GetCount(); - length+= startItemcount; - for(UINT_PTR index = startItemcount; index < length;index++){ + BOOL CCommentWriteWindow::IsWrighthing(){ - combo.AddString(colorList[index - startItemcount].name); - combo.SetItemDataPtr(index,(LPVOID)&colorList[index - startItemcount]); + return this->commentSubEdit.untilConnectingFlag; } - return; -} + UINT_PTR CCommentWriteWindow::GetHeight(){ + + return commentWriteHeight + infoDispHeight - COMMENTWRITEWINDOW_SEPARATEFSIZE.top; + } + LRESULT CCommentWriteWindow::OnCreate(LPCREATESTRUCT lpReateStruct){ + + //EBhEì¬ + + commentPosBox.Create(m_hWnd,0,WC_COMBOBOX,WS_CHILD | WS_VISIBLE | CBS_DROPDOWNLIST ,0,COMMENTPOS_BOX); + commentSizeBox.Create(m_hWnd,0,WC_COMBOBOX,WS_CHILD | WS_VISIBLE | CBS_DROPDOWNLIST,0,COMMENTSIZE_BOX); + commentColorBox.Create(m_hWnd,0,WC_COMBOBOX,WS_CHILD | WS_VISIBLE | CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED ,0,COMMENTCOLOR_BOX); + anonymousButton.Create(m_hWnd,0,WC_BUTTON,WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX | BS_PUSHLIKE,0,ANONYMOUS_BUTTON); + ownerModeButton.Create(m_hWnd,0,WC_BUTTON,WS_CHILD |BS_AUTOCHECKBOX | BS_PUSHLIKE,0,OWNERMODE_BUTTON); + commentSubEdit.Create(m_hWnd,0,WC_EDIT,WS_CHILD | WS_VISIBLE | WS_BORDER | ES_AUTOHSCROLL,0,COMMENT_EDIT); + commentWriteButton.Create(m_hWnd,0,WC_BUTTON,WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON,0,COMMENTWRITE_BOTTON); + commentPosBox.SetFont(AtlGetDefaultGuiFont()); + commentSizeBox.SetFont(AtlGetDefaultGuiFont()); + commentColorBox.SetFont(AtlGetDefaultGuiFont()); + + //tHgÌÝè + anonymousButton.SetFont(AtlGetDefaultGuiFont()); + commentSubEdit.SetFont(AtlGetDefaultGuiFont()); + commentSubEdit.SetLimitText(commentWriteMaxLength); + commentWriteButton.SetWindowTextW(WRITE_BOTTONSTRING); + commentWriteButton.SetFont(AtlGetDefaultGuiFont()); + + commentSubEdit.SetWindowTextW(TEXT("")); + + addItemList(commentColorBox,generalUser::COMMENT_COLORLIST,ARRAY_LENGTH(generalUser::COMMENT_COLORLIST)); + addItemList(commentSizeBox,generalUser::COMMENT_SIZELIST,ARRAY_LENGTH(generalUser::COMMENT_SIZELIST)); + addItemList(commentPosBox,generalUser::COMMENT_POSLIST,ARRAY_LENGTH(generalUser::COMMENT_POSLIST)); + commentColorBox.SetCurSel(0); + commentSizeBox.SetCurSel(0); + commentPosBox.SetCurSel(0); + CFontHandle font; + font = AtlGetDefaultGuiFont(); + CPaintDC pdc(*this); + SIZE thisSize; + + //EBhEÌ³ðßé + LPCTSTR sample = TEXT(" "); + GetTextExtentPoint32(pdc,sample,_tcslen(sample),&thisSize); + commentWriteHeight = thisSize.cy + COMMENTWRITEWINDOW_SEPARATEFSIZE.top + COMMENTWRITEWINDOW_SEPARATEFSIZE.bottom; + infoDispHeight = commentWriteHeight; + commentWriteInternalHeight = commentWriteHeight - (COMMENTWRITEWINDOW_SEPARATEFSIZE.top + COMMENTWRITEWINDOW_SEPARATEFSIZE.bottom); + + //vbVCN{^ÌtHgðßé + LOGFONT anonymousLogFont = {0}; + anonymousLogFont.lfHeight = CHECKBUTTON_SUBSCRIPT_HEIGHT; + anonymousLogFont.lfCharSet = SHIFTJIS_CHARSET; + + checkButtonFont.CreateFontIndirect(&anonymousLogFont); + anonymousButton.SetFont(checkButtonFont); + ownerModeButton.SetFont(checkButtonFont); + CFontHandle f = AtlGetDefaultGuiFont(); + LOGFONT timeLogFont; + f.GetLogFont(timeLogFont); + + timeLogFont.lfWeight = FW_BOLD; + + timeFont.CreateFontIndirectW(&timeLogFont); + anonymousButton.SetWindowTextW(ANONYMOUS_MAILCOMMAND); + ownerModeButton.SetWindowText(OWNERMODE_BOTTONSTRING); + return 0; + } -template -static UINT_PTR CalcComboBoxWidth(CComboBox &combo){ + VOID CCommentWriteWindow::OnDestroy(){ + commentPosBox.DestroyWindow(); + commentSizeBox.DestroyWindow(); + commentColorBox.DestroyWindow(); + anonymousButton.DestroyWindow(); + commentSubEdit.DestroyWindow(); + commentWriteButton.DestroyWindow(); - CPaintDC pdc(combo); - SIZE size; - UINT_PTR rslt = 0; - UINT_PTR itemCount = combo.GetCount(); - LPCTSTR name; - for(UINT_PTR index = 0;index < itemCount;index++){ - name = ((T*)combo.GetItemDataPtr(index))->name; - ::GetTextExtentPoint32(pdc,name,_tcslen(name),&size); - rslt = rslt < (UINT_PTR)size.cx ? size.cx : rslt; } - return rslt; -} - -CCommentWriteWindow::CCommentWriteWindow(CNicoLiveStream &in_nicoLiveStream): -commentWriteHeight(0), -commentWriteInternalHeight(0), -commentWriteMaxLength(INIT_COMMENTWRITE_MAXLENGTH), -nicoLiveStream(in_nicoLiveStream), -commentSubEdit(*this), -streamTime(0) -{} - - -BOOL CCommentWriteWindow::IsWrighthing(){ - - return this->commentSubEdit.untilConnectingFlag; - -} - -UINT_PTR CCommentWriteWindow::GetHeight(){ - - return commentWriteHeight + infoDispHeight - COMMENTWRITEWINDOW_SEPARATEFSIZE.top; -} - - -LRESULT CCommentWriteWindow::OnCreate(LPCREATESTRUCT lpReateStruct){ - - //EBhEì¬ - - commentPosBox.Create(m_hWnd,0,WC_COMBOBOX,WS_CHILD | WS_VISIBLE | CBS_DROPDOWNLIST ,0,COMMENTPOS_BOX); - commentSizeBox.Create(m_hWnd,0,WC_COMBOBOX,WS_CHILD | WS_VISIBLE | CBS_DROPDOWNLIST,0,COMMENTSIZE_BOX); - commentColorBox.Create(m_hWnd,0,WC_COMBOBOX,WS_CHILD | WS_VISIBLE | CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED ,0,COMMENTCOLOR_BOX); - anonymousButton.Create(m_hWnd,0,WC_BUTTON,WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX | BS_PUSHLIKE,0,ANONYMOUS_BUTTON); - ownerModeButton.Create(m_hWnd,0,WC_BUTTON,WS_CHILD |BS_AUTOCHECKBOX | BS_PUSHLIKE,0,OWNERMODE_BUTTON); - commentSubEdit.Create(m_hWnd,0,WC_EDIT,WS_CHILD | WS_VISIBLE | WS_BORDER | ES_AUTOHSCROLL,0,COMMENT_EDIT); - commentWriteButton.Create(m_hWnd,0,WC_BUTTON,WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON,0,COMMENTWRITE_BOTTON); - commentPosBox.SetFont(AtlGetDefaultGuiFont()); - commentSizeBox.SetFont(AtlGetDefaultGuiFont()); - commentColorBox.SetFont(AtlGetDefaultGuiFont()); - - - anonymousButton.SetFont(AtlGetDefaultGuiFont()); - commentSubEdit.SetFont(AtlGetDefaultGuiFont()); - commentSubEdit.SetLimitText(commentWriteMaxLength); - commentWriteButton.SetWindowTextW(WRITE_BOTTONSTRING); - commentWriteButton.SetFont(AtlGetDefaultGuiFont()); - commentSubEdit.SetWindowTextW(TEXT("")); - - addItemList(commentColorBox,generalUser::COMMENT_COLORLIST,ARRAY_LENGTH(generalUser::COMMENT_COLORLIST)); - addItemList(commentSizeBox,generalUser::COMMENT_SIZELIST,ARRAY_LENGTH(generalUser::COMMENT_SIZELIST)); - addItemList(commentPosBox,generalUser::COMMENT_POSLIST,ARRAY_LENGTH(generalUser::COMMENT_POSLIST)); - commentColorBox.SetCurSel(0); - commentSizeBox.SetCurSel(0); - commentPosBox.SetCurSel(0); - CFontHandle font; - font = AtlGetDefaultGuiFont(); - CPaintDC pdc(*this); - SIZE thisSize; - LPCTSTR sample = TEXT(" "); - - GetTextExtentPoint32(pdc,sample,_tcslen(sample),&thisSize); - commentWriteHeight = thisSize.cy + COMMENTWRITEWINDOW_SEPARATEFSIZE.top + COMMENTWRITEWINDOW_SEPARATEFSIZE.bottom; - infoDispHeight = commentWriteHeight; - commentWriteInternalHeight = commentWriteHeight - (COMMENTWRITEWINDOW_SEPARATEFSIZE.top + COMMENTWRITEWINDOW_SEPARATEFSIZE.bottom); - - LOGFONT anonymousLogFont = {0}; - anonymousLogFont.lfHeight = CHECKBUTTON_SUBSCRIPT_HEIGHT; - anonymousLogFont.lfCharSet = SHIFTJIS_CHARSET; - - checkButtonFont.CreateFontIndirect(&anonymousLogFont); - anonymousButton.SetFont(checkButtonFont); - ownerModeButton.SetFont(checkButtonFont); - CFontHandle f = AtlGetDefaultGuiFont(); - LOGFONT timeLogFont; - f.GetLogFont(timeLogFont); - - timeLogFont.lfWeight = FW_BOLD; - - timeFont.CreateFontIndirectW(&timeLogFont); - anonymousButton.SetWindowTextW(ANONYMOUS_MAILCOMMAND); - ownerModeButton.SetWindowText(OWNERMODE_BOTTONSTRING); - return 0; -} - -VOID CCommentWriteWindow::OnDestroy(){ - commentPosBox.DestroyWindow(); - commentSizeBox.DestroyWindow(); - commentColorBox.DestroyWindow(); - anonymousButton.DestroyWindow(); - commentSubEdit.DestroyWindow(); - commentWriteButton.DestroyWindow(); - -} - - - -LRESULT CCommentWriteWindow::OnSize(UINT wParam,SIZE lParam){ - ChangeSize(lParam); - return 0; -} -VOID CCommentWriteWindow::OnPaint(HDC hdc){ - - CPaintDC pdc(*this); - RECT clientRect; - this->GetClientRect(&clientRect); - - pdc.FillRect(&clientRect,COLOR_BTNFACE); - - - - - pdc.SetBkColor(GetSysColor(COLOR_BTNFACE)); - if(streamTime != 0){ - - RECT timeStringRect; - - TCHAR timeString[LENGTH_256]; - _tcscpy(timeString,TEXT("oßÔ:")); - LPTSTR timePtr = timeString + _tcslen(timeString); - time_t dispTime = static_cast(difftime(streamTime,nicoLiveStream.GetStartTime())); - LPTSTR timeFormat; - BOOL yetStartFlag = FALSE; - if(dispTime < 0){ - yetStartFlag = TRUE; - dispTime = abs(dispTime); - } - tm dispTimeStruct = *gmtime(&dispTime); - if(dispTimeStruct.tm_hour > 0 && yetStartFlag == TRUE){ + LRESULT CCommentWriteWindow::OnSize(UINT wParam,SIZE lParam){ + ChangeSize(lParam); + return 0; + } + VOID CCommentWriteWindow::OnPaint(HDC hdc){ - timeFormat = TEXT("-%H:%M:%S"); + CPaintDC pdc(*this); + RECT clientRect; + this->GetClientRect(&clientRect); - } else if(dispTimeStruct.tm_hour <= 0 && yetStartFlag == TRUE){ + pdc.FillRect(&clientRect,COLOR_BTNFACE); - timeFormat = TEXT(" -%M:%S"); - } else if(dispTimeStruct.tm_hour > 0){ - timeFormat = TEXT(" %H:%M:%S"); - }else { - - timeFormat = TEXT(" %M:%S"); + pdc.SetBkColor(GetSysColor(COLOR_BTNFACE)); + if(streamTime != 0){ - } + RECT timeStringRect; - _tcsftime(timePtr,ARRAY_LENGTH(timeString) - _tcslen(timeString),timeFormat,&dispTimeStruct); + TCHAR timeString[LENGTH_256]; + _tcscpy(timeString,TEXT("oßÔ:")); + LPTSTR timePtr = timeString + _tcslen(timeString); + time_t dispTime = static_cast(difftime(streamTime,nicoLiveStream.GetStartTime())); + LPTSTR timeFormat; + BOOL yetStartFlag = FALSE; + if(dispTime < 0){ + yetStartFlag = TRUE; + dispTime = abs(dispTime); + } - INT_PTR len = _tcslen(timeString); - pdc.SelectFont(timeFont); + tm dispTimeStruct = *gmtime(&dispTime); - - timeStringRect.top = COMMENTWRITEWINDOW_SEPARATEFSIZE.top; - timeStringRect.left = COMMENTWRITEWINDOW_SIDESEPARATESIZE; - timeStringRect.bottom =timeStringRect.top; - timeStringRect.right = timeStringRect.bottom; - pdc.DrawTextW(timeString,len,&timeStringRect,DT_CALCRECT); - pdc.DrawTextW(timeString,len,&timeStringRect,0); - } + if(dispTimeStruct.tm_hour > 0 && yetStartFlag == TRUE){ + timeFormat = TEXT("-%H:%M:%S"); - - - return; -} + } else if(dispTimeStruct.tm_hour <= 0 && yetStartFlag == TRUE){ -VOID CSubChatEdit::EnterChatBox(LPVOID userData){ + timeFormat = TEXT(" -%M:%S"); + } else if(dispTimeStruct.tm_hour > 0){ - auto owner = ((CSubChatEdit*)userData)->self; - auto &self = *((CSubChatEdit*)userData); - CCommentMaker commentMaker; - std::vector chat(owner.commentSubEdit.GetWindowTextLengthW() + 1); + timeFormat = TEXT(" %H:%M:%S"); + }else { - owner.commentSubEdit.GetWindowTextW(&chat[0],chat.size()); - commentMaker.SetChatString(&chat[0]); - if(owner.anonymousButton.GetCheck() == BST_CHECKED){ + timeFormat = TEXT(" %M:%S"); - commentMaker.AddMail(ANONYMOUS_MAILCOMMAND); - } - INT_PTR sizeIndex = owner.commentSizeBox.GetCurSel(); - if(sizeIndex == CB_ERR)sizeIndex = 0; - auto &rCommentSizeInfo = *(CommentSizeInfo*)owner.commentSizeBox.GetItemDataPtr(sizeIndex); + } - if(_tcscmp(rCommentSizeInfo.userData,DEFAULT_COMMENTSIZE) != 0){ + _tcsftime(timePtr,ARRAY_LENGTH(timeString) - _tcslen(timeString),timeFormat,&dispTimeStruct); - commentMaker.AddMail(rCommentSizeInfo.userData); + INT_PTR len = _tcslen(timeString); + pdc.SelectFont(timeFont); - } - INT_PTR posIndex = owner.commentPosBox.GetCurSel(); - if(posIndex == CB_ERR)posIndex = 0; - auto &rCommentPosInfo = *(CommentPosInfo*)owner.commentPosBox.GetItemDataPtr(posIndex); - if(_tcscmp(rCommentPosInfo.userData,DEFAULT_COMMENTPOS) != 0){ + timeStringRect.top = COMMENTWRITEWINDOW_SEPARATEFSIZE.top; + timeStringRect.left = COMMENTWRITEWINDOW_SIDESEPARATESIZE; + timeStringRect.bottom =timeStringRect.top; + timeStringRect.right = timeStringRect.bottom; + pdc.DrawTextW(timeString,len,&timeStringRect,DT_CALCRECT); + pdc.DrawTextW(timeString,len,&timeStringRect,0); + } - commentMaker.AddMail(rCommentPosInfo.userData); - } - INT_PTR colorIndex = owner.commentColorBox.GetCurSel(); - if(colorIndex == CB_ERR)colorIndex = 0; - auto &rCommentColorInfo = *(CommentColorInfo*)owner.commentColorBox.GetItemDataPtr(colorIndex); - if(_tcscmp(rCommentColorInfo.name,DEFAULT_COMMENTCOLOR) != 0){ - commentMaker.AddMail(rCommentColorInfo.name); + return; } + VOID CSubChatEdit::EnterChatBox(LPVOID userData){ - NLIB_RESULT code = NLIB_ERR_CODE_NOTSET; - if(owner.nicoLiveStream.IsOwner() ==TRUE && owner.ownerModeButton.GetCheck() == BST_CHECKED){ - - code = owner.nicoLiveStream.SendOwnerChat(commentMaker); + auto owner = ((CSubChatEdit*)userData)->self; + auto &self = *((CSubChatEdit*)userData); + CCommentMaker commentMaker; + std::vector chat(owner.commentSubEdit.GetWindowTextLengthW() + 1); - } else { - code = owner.nicoLiveStream.SendChat(commentMaker); + owner.commentSubEdit.GetWindowTextW(&chat[0],chat.size()); + commentMaker.SetChatString(&chat[0]); + if(owner.anonymousButton.GetCheck() == BST_CHECKED){ - } + commentMaker.AddMail(ANONYMOUS_MAILCOMMAND); + } + INT_PTR sizeIndex = owner.commentSizeBox.GetCurSel(); + if(sizeIndex == CB_ERR)sizeIndex = 0; + auto &rCommentSizeInfo = *(CommentSizeInfo*)owner.commentSizeBox.GetItemDataPtr(sizeIndex); + + if(_tcscmp(rCommentSizeInfo.userData,DEFAULT_COMMENTSIZE) != 0){ - switch(code){ + commentMaker.AddMail(rCommentSizeInfo.userData); - case NLIB_ERR_OK: + } + INT_PTR posIndex = owner.commentPosBox.GetCurSel(); + if(posIndex == CB_ERR)posIndex = 0; + auto &rCommentPosInfo = *(CommentPosInfo*)owner.commentPosBox.GetItemDataPtr(posIndex); + if(_tcscmp(rCommentPosInfo.userData,DEFAULT_COMMENTPOS) != 0){ - owner.commentSubEdit.SetWindowText(TEXT("")); - goto end; + commentMaker.AddMail(rCommentPosInfo.userData); + } - case NLIB_ERR_NOT_LIVECONNECT: - case NLIB_FAILED_CONNECT: - ::MessageBox(owner,NLIB_GetErrorMessage(code),TEXT("Rg«ÝG["),MB_ICONERROR | MB_OK); - owner.commentSubEdit.AgreeEnter(); - break; + INT_PTR colorIndex = owner.commentColorBox.GetCurSel(); + if(colorIndex == CB_ERR)colorIndex = 0; + auto &rCommentColorInfo = *(CommentColorInfo*)owner.commentColorBox.GetItemDataPtr(colorIndex); - + if(_tcscmp(rCommentColorInfo.name,DEFAULT_COMMENTCOLOR) != 0){ + commentMaker.AddMail(rCommentColorInfo.name); + } - default: - UnexpectedErrorMessageShow(TEXT("Rg«ÝÉ"),NLIB_GetErrorMessage(code),__LINE__,TEXT(__FILE__),TEXT(__FUNCTION__)); - owner.commentSubEdit.AgreeEnter(); - break; + NLIB_RESULT code = NLIB_ERR_CODE_NOTSET; - } + if(owner.nicoLiveStream.IsOwner() ==TRUE && owner.ownerModeButton.GetCheck() == BST_CHECKED){ + code = owner.nicoLiveStream.SendOwnerChat(commentMaker); -end: + } else { + code = owner.nicoLiveStream.SendChat(commentMaker); + } - - self.AgreeEnter(); + switch(code){ - _endthread(); - return; -} + case NLIB_ERR_OK: -BOOL CCommentWriteWindow::SendChat(){ - this->commentSubEdit.untilConnectingFlag = TRUE; - this->commentSubEdit.SetReadOnly(TRUE); - _beginthread(CSubChatEdit::EnterChatBox,0,&this->commentSubEdit); - - - + owner.commentSubEdit.SetWindowText(TEXT("")); + goto end; + case NLIB_ERR_NOT_LIVECONNECT: + case NLIB_FAILED_CONNECT: + ::MessageBox(owner,NLIB_GetErrorMessage(code),TEXT("Rg«ÝG["),MB_ICONERROR | MB_OK); + owner.commentSubEdit.AgreeEnter(); + break; - return TRUE; -} -BOOL CCommentWriteWindow::SetText(LPCTSTR lpStr){ - - BOOL rslt = this->commentSubEdit.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); - this->commentColorBox.ResetContent(); - this->commentPosBox.ResetContent(); - this->commentSizeBox.ResetContent(); + default: + UnexpectedErrorMessageShow(TEXT("Rg«ÝÉ"),NLIB_GetErrorMessage(code),__LINE__,TEXT(__FILE__),TEXT(__FUNCTION__)); + owner.commentSubEdit.AgreeEnter(); + break; - addItemList(commentColorBox,generalUser::COMMENT_COLORLIST,ARRAY_LENGTH(generalUser::COMMENT_COLORLIST)); - addItemList(commentSizeBox,generalUser::COMMENT_SIZELIST,ARRAY_LENGTH(generalUser::COMMENT_SIZELIST)); - addItemList(commentPosBox,generalUser::COMMENT_POSLIST,ARRAY_LENGTH(generalUser::COMMENT_POSLIST)); + } - if(nicoLiveStream.IsPremium() == TRUE){ +end: - addItemList(commentColorBox,premiumUser::COMMENT_COLORLIST,ARRAY_LENGTH(premiumUser::COMMENT_COLORLIST)); - addItemList(commentSizeBox,premiumUser::COMMENT_SIZELIST,ARRAY_LENGTH(premiumUser::COMMENT_SIZELIST)); - addItemList(commentPosBox,premiumUser::COMMENT_POSLIST,ARRAY_LENGTH(premiumUser::COMMENT_POSLIST)); + + + self.AgreeEnter(); + + _endthread(); + return; } - this->commentColorBox.SetCurSel(0); - this->commentPosBox.SetCurSel(0); - this->commentSizeBox.SetCurSel(0); - + BOOL CCommentWriteWindow::SendChat(){ + this->commentSubEdit.untilConnectingFlag = TRUE; + this->commentSubEdit.SetReadOnly(TRUE); + _beginthread(CSubChatEdit::EnterChatBox,0,&this->commentSubEdit); - this->ShowWindow(SW_SHOW); - this->streamTime = threadComment->server_time; - this->SetTimer(TIMER_ID,1000,NULL); - if(nicoLiveStream.IsOwner() == TRUE){ - this->ownerModeButton.ShowWindow(SW_SHOW); - ownerModeButton.SetCheck(BST_CHECKED); - editBkColor = OWNEREDITCOLOR; - - } else { - this->ownerModeButton.ShowWindow(SW_HIDE); - editBkColor = NORMALEDITCOLOR; - } - if(this->editBkBrush.IsNull() ==FALSE){ - editBkBrush.DeleteObject(); + + + return TRUE; } - editBkBrush.CreateSolidBrush(editBkColor); - SIZE size; - RECT windowRect; - this->GetClientRect(&windowRect); - size.cx = windowRect.right - windowRect.left; - size.cy = windowRect.bottom - windowRect.top; - ChangeSize(size); - - return; -} - -VOID CCommentWriteWindow::ChangeSize(SIZE &size){ - - SIZE commentAnonymousButtonSize; - SIZE commentWriteButtonSize; - commentWriteButton.GetIdealSize(&commentWriteButtonSize); - anonymousButton.GetIdealSize(&commentAnonymousButtonSize); - UINT_PTR defwindowCount = 0; - RECT commentPosBoxRect; - RECT commentSizeBoxRect; - RECT commentColorBoxRect; - RECT anonymousButtonRect; - RECT commentEditRect; - RECT commentWriteButtonRect; - RECT ownerModeButtonRect; - RECT thisWindowRect; - - UINT_PTR writeSpaceHeight = COMMENTWRITEWINDOW_SEPARATEFSIZE.top * 2 + commentWriteInternalHeight; - this->GetWindowRect(&thisWindowRect); - - commentPosBoxRect.left = COMMENTWRITEWINDOW_SIDESEPARATESIZE; - this->commentPosBoxCS.Lock(); - commentPosBoxRect.right = commentPosBoxRect.left + CalcComboBoxWidth(commentPosBox); - this->commentPosBoxCS.Unlock(); - - commentSizeBoxRect.left = commentPosBoxRect.right + COMMENTWRITEWINDOW_SIDESEPARATESIZE; - this->commentSizeBoxCS.Lock(); - commentSizeBoxRect.right = commentSizeBoxRect.left + CalcComboBoxWidth(commentSizeBox); - this->commentSizeBoxCS.Unlock(); - - commentColorBoxRect.left = commentSizeBoxRect.right + COMMENTWRITEWINDOW_SIDESEPARATESIZE; - commentColorBoxRect.right = commentColorBoxRect.left + commentColorBoxSize.cx; - - - - anonymousButtonRect.left = commentColorBoxRect.right + COMMENTWRITEWINDOW_SIDESEPARATESIZE; - anonymousButtonRect.right = anonymousButtonRect.left + commentAnonymousButtonSize.cx; - - if(ownerModeButton.IsWindowVisible() == TRUE){ - - - SIZE ownerModeButtonSize; - ownerModeButton.GetIdealSize(&ownerModeButtonSize); - ownerModeButtonRect.left = anonymousButtonRect.right + COMMENTWRITEWINDOW_SIDESEPARATESIZE; - ownerModeButtonRect.right = ownerModeButtonRect.left + ownerModeButtonSize.cx; - commentEditRect.left = ownerModeButtonRect.right + COMMENTWRITEWINDOW_SIDESEPARATESIZE; - defwindowCount = 7; - } else { - - commentEditRect.left = anonymousButtonRect.right + COMMENTWRITEWINDOW_SIDESEPARATESIZE; - defwindowCount = 6; + + BOOL CCommentWriteWindow::SetText(LPCTSTR lpStr){ + + BOOL rslt = this->commentSubEdit.SetWindowText(lpStr); + if(rslt == TRUE){ + commentSubEdit.SetFocus(); + int cursor = commentSubEdit.GetWindowTextLength(); + commentSubEdit.SetSel(cursor,cursor); + //commentSubEdit.ShowCaret(); + } + return rslt; } - - commentWriteButtonRect.right = size.cx - COMMENTWRITEWINDOW_SIDESEPARATESIZE; - commentWriteButtonRect.left = commentWriteButtonRect.right - commentWriteButtonSize.cx; - commentEditRect.right = commentWriteButtonRect.left - COMMENTWRITEWINDOW_SIDESEPARATESIZE; + VOID CCommentWriteWindow::OnChatReceveStart(CNicoLiveStream &nicoLiveStream,NicoLiveThreadComment_P threadComment){ + + this->ShowWindow(SW_HIDE); + this->commentColorBox.ResetContent(); + this->commentPosBox.ResetContent(); + this->commentSizeBox.ResetContent(); - + addItemList(commentColorBox,generalUser::COMMENT_COLORLIST,ARRAY_LENGTH(generalUser::COMMENT_COLORLIST)); + addItemList(commentSizeBox,generalUser::COMMENT_SIZELIST,ARRAY_LENGTH(generalUser::COMMENT_SIZELIST)); + addItemList(commentPosBox,generalUser::COMMENT_POSLIST,ARRAY_LENGTH(generalUser::COMMENT_POSLIST)); - //Ú® - HDWP hDwp = BeginDeferWindowPos(defwindowCount); - - commentPosBox.DeferWindowPos(hDwp,*this, - commentPosBoxRect.left,writeSpaceHeight,commentPosBoxRect.right - commentPosBoxRect.left,commentWriteInternalHeight, - SWP_NOZORDER); - commentSizeBox.DeferWindowPos(hDwp,*this, - commentSizeBoxRect.left,writeSpaceHeight,commentSizeBoxRect.right - commentSizeBoxRect.left,commentWriteInternalHeight, - SWP_NOZORDER); + if(nicoLiveStream.IsPremium() == TRUE){ - commentColorBox.DeferWindowPos(hDwp,*this, - commentColorBoxRect.left,writeSpaceHeight,commentColorBoxRect.right - commentColorBoxRect.left,commentWriteInternalHeight, - SWP_NOZORDER); + addItemList(commentColorBox,premiumUser::COMMENT_COLORLIST,ARRAY_LENGTH(premiumUser::COMMENT_COLORLIST)); + addItemList(commentSizeBox,premiumUser::COMMENT_SIZELIST,ARRAY_LENGTH(premiumUser::COMMENT_SIZELIST)); + addItemList(commentPosBox,premiumUser::COMMENT_POSLIST,ARRAY_LENGTH(premiumUser::COMMENT_POSLIST)); - anonymousButton.DeferWindowPos(hDwp,*this, - anonymousButtonRect.left,writeSpaceHeight,anonymousButtonRect.right - anonymousButtonRect.left,commentWriteInternalHeight, - SWP_NOZORDER); + } + this->commentColorBox.SetCurSel(0); + this->commentPosBox.SetCurSel(0); + this->commentSizeBox.SetCurSel(0); - if(ownerModeButton.IsWindowVisible() == TRUE){ - ownerModeButton.DeferWindowPos(hDwp,*this, - ownerModeButtonRect.left,writeSpaceHeight,ownerModeButtonRect.right - ownerModeButtonRect.left,commentWriteInternalHeight, - SWP_NOZORDER); - } - commentSubEdit.DeferWindowPos(hDwp,*this, - commentEditRect.left,writeSpaceHeight,commentEditRect.right - commentEditRect.left,commentWriteInternalHeight, - SWP_NOZORDER); - - commentWriteButton.DeferWindowPos(hDwp,*this, - commentWriteButtonRect.left,writeSpaceHeight,commentWriteButtonRect.right - commentWriteButtonRect.left,commentWriteInternalHeight, - SWP_NOZORDER); - - EndDeferWindowPos(hDwp); - - return; -} - -VOID CCommentWriteWindow::OnDrawItem(UINT wParam,LPDRAWITEMSTRUCT lParam){ - - - - if(lParam->hwndItem == commentColorBox.m_hWnd && commentColorBox.GetCount() > 0){ - - - - RECT drawRect = lParam->rcItem; - UINT_PTR itemNo = 0; - INT_PTR curselNo = commentColorBox.GetCurSel(); - CDCHandle dcHandle = lParam->hDC; - CBrush bkBrush; - const UINT_PTR width = 1; - drawRect.left += width; - drawRect.top += width; - drawRect.right -= width; - drawRect.bottom -= width; - - if(lParam->itemID == ((UINT)-1)){ - itemNo = curselNo == CB_ERR ? 0 : curselNo; + + this->ShowWindow(SW_SHOW); + this->streamTime = threadComment->server_time; + this->SetTimer(TIMER_ID,1000,NULL); + if(nicoLiveStream.IsOwner() == TRUE){ + + this->ownerModeButton.ShowWindow(SW_SHOW); + ownerModeButton.SetCheck(BST_CHECKED); + editBkColor = OWNEREDITCOLOR; + } else { - itemNo = lParam->itemID; + + this->ownerModeButton.ShowWindow(SW_HIDE); + editBkColor = NORMALEDITCOLOR; + + } + + if(this->editBkBrush.IsNull() ==FALSE){ + editBkBrush.DeleteObject(); } - - CommentInfo &commentColor = *(CommentInfo *)commentColorBox.GetItemDataPtr(itemNo); - - - if(lParam->itemState & (ODS_FOCUS | ODS_COMBOBOXEDIT)){ - - - - bkBrush.CreateSolidBrush(PALETTERGB(160,160,160)); - + + editBkBrush.CreateSolidBrush(editBkColor); + SIZE size; + RECT windowRect; + this->GetClientRect(&windowRect); + size.cx = windowRect.right - windowRect.left; + size.cy = windowRect.bottom - windowRect.top; + ChangeSize(size); + + return; + } + + VOID CCommentWriteWindow::ChangeSize(SIZE &size){ + + SIZE commentAnonymousButtonSize; + SIZE commentWriteButtonSize; + commentWriteButton.GetIdealSize(&commentWriteButtonSize); + anonymousButton.GetIdealSize(&commentAnonymousButtonSize); + UINT_PTR defwindowCount = 0; + RECT commentPosBoxRect; + RECT commentSizeBoxRect; + RECT commentColorBoxRect; + RECT anonymousButtonRect; + RECT commentEditRect; + RECT commentWriteButtonRect; + RECT ownerModeButtonRect; + RECT thisWindowRect; + + UINT_PTR writeSpaceHeight = COMMENTWRITEWINDOW_SEPARATEFSIZE.top * 2 + commentWriteInternalHeight; + this->GetWindowRect(&thisWindowRect); + + commentPosBoxRect.left = COMMENTWRITEWINDOW_SIDESEPARATESIZE; + this->commentPosBoxCS.Lock(); + commentPosBoxRect.right = commentPosBoxRect.left + CalcComboBoxWidth(commentPosBox); + this->commentPosBoxCS.Unlock(); + + commentSizeBoxRect.left = commentPosBoxRect.right + COMMENTWRITEWINDOW_SIDESEPARATESIZE; + this->commentSizeBoxCS.Lock(); + commentSizeBoxRect.right = commentSizeBoxRect.left + CalcComboBoxWidth(commentSizeBox); + this->commentSizeBoxCS.Unlock(); + + commentColorBoxRect.left = commentSizeBoxRect.right + COMMENTWRITEWINDOW_SIDESEPARATESIZE; + commentColorBoxRect.right = commentColorBoxRect.left + commentColorBoxSize.cx; + + + + anonymousButtonRect.left = commentColorBoxRect.right + COMMENTWRITEWINDOW_SIDESEPARATESIZE; + anonymousButtonRect.right = anonymousButtonRect.left + commentAnonymousButtonSize.cx; + + if(ownerModeButton.IsWindowVisible() == TRUE){ + + + SIZE ownerModeButtonSize; + ownerModeButton.GetIdealSize(&ownerModeButtonSize); + ownerModeButtonRect.left = anonymousButtonRect.right + COMMENTWRITEWINDOW_SIDESEPARATESIZE; + ownerModeButtonRect.right = ownerModeButtonRect.left + ownerModeButtonSize.cx; + commentEditRect.left = ownerModeButtonRect.right + COMMENTWRITEWINDOW_SIDESEPARATESIZE; + defwindowCount = 7; } else { - bkBrush.CreateSolidBrush(PALETTERGB(255,255,255)); + commentEditRect.left = anonymousButtonRect.right + COMMENTWRITEWINDOW_SIDESEPARATESIZE; + defwindowCount = 6; + } + + commentWriteButtonRect.right = size.cx - COMMENTWRITEWINDOW_SIDESEPARATESIZE; + commentWriteButtonRect.left = commentWriteButtonRect.right - commentWriteButtonSize.cx; + + commentEditRect.right = commentWriteButtonRect.left - COMMENTWRITEWINDOW_SIDESEPARATESIZE; + + + + //Ú® + HDWP hDwp = BeginDeferWindowPos(defwindowCount); + + commentPosBox.DeferWindowPos(hDwp,*this, + commentPosBoxRect.left,writeSpaceHeight,commentPosBoxRect.right - commentPosBoxRect.left,commentWriteInternalHeight, + SWP_NOZORDER); + + commentSizeBox.DeferWindowPos(hDwp,*this, + commentSizeBoxRect.left,writeSpaceHeight,commentSizeBoxRect.right - commentSizeBoxRect.left,commentWriteInternalHeight, + SWP_NOZORDER); + + commentColorBox.DeferWindowPos(hDwp,*this, + commentColorBoxRect.left,writeSpaceHeight,commentColorBoxRect.right - commentColorBoxRect.left,commentWriteInternalHeight, + SWP_NOZORDER); + + anonymousButton.DeferWindowPos(hDwp,*this, + anonymousButtonRect.left,writeSpaceHeight,anonymousButtonRect.right - anonymousButtonRect.left,commentWriteInternalHeight, + SWP_NOZORDER); + + if(ownerModeButton.IsWindowVisible() == TRUE){ + ownerModeButton.DeferWindowPos(hDwp,*this, + ownerModeButtonRect.left,writeSpaceHeight,ownerModeButtonRect.right - ownerModeButtonRect.left,commentWriteInternalHeight, + SWP_NOZORDER); } + commentSubEdit.DeferWindowPos(hDwp,*this, + commentEditRect.left,writeSpaceHeight,commentEditRect.right - commentEditRect.left,commentWriteInternalHeight, + SWP_NOZORDER); + commentWriteButton.DeferWindowPos(hDwp,*this, + commentWriteButtonRect.left,writeSpaceHeight,commentWriteButtonRect.right - commentWriteButtonRect.left,commentWriteInternalHeight, + SWP_NOZORDER); - - - CBrush brush; - CPen cpen; + EndDeferWindowPos(hDwp); - brush.CreateSolidBrush(commentColor.userData); - dcHandle.SelectBrush(brush); - dcHandle.FillRect(&lParam->rcItem,bkBrush); - dcHandle.SelectBrush(brush); - dcHandle.SelectPen((HPEN)::GetStockObject(BLACK_PEN)); - dcHandle.Rectangle(&drawRect); - + return; } - return; -} + VOID CCommentWriteWindow::OnDrawItem(UINT wParam,LPDRAWITEMSTRUCT lParam){ + + + + if(lParam->hwndItem == commentColorBox.m_hWnd && commentColorBox.GetCount() > 0){ + + + + RECT drawRect = lParam->rcItem; + UINT_PTR itemNo = 0; + INT_PTR curselNo = commentColorBox.GetCurSel(); + CDCHandle dcHandle = lParam->hDC; + CBrush bkBrush; + const UINT_PTR width = 1; + drawRect.left += width; + drawRect.top += width; + drawRect.right -= width; + drawRect.bottom -= width; + + if(lParam->itemID == ((UINT)-1)){ + itemNo = curselNo == CB_ERR ? 0 : curselNo; + } else { + itemNo = lParam->itemID; + } + + CommentInfo &commentColor = *(CommentInfo *)commentColorBox.GetItemDataPtr(itemNo); + + + if(lParam->itemState & (ODS_FOCUS | ODS_COMBOBOXEDIT)){ + + + + bkBrush.CreateSolidBrush(PALETTERGB(160,160,160)); + + } else { + + bkBrush.CreateSolidBrush(PALETTERGB(255,255,255)); + + } + -LRESULT CCommentWriteWindow::OnEraseBkGnd(HDC wParam){ - return TRUE; -} + CBrush brush; + CPen cpen; -LRESULT CCommentWriteWindow::OnCtlolorEdit(HDC hdc,HWND hWnd){ + brush.CreateSolidBrush(commentColor.userData); + dcHandle.SelectBrush(brush); + dcHandle.FillRect(&lParam->rcItem,bkBrush); + dcHandle.SelectBrush(brush); + dcHandle.SelectPen((HPEN)::GetStockObject(BLACK_PEN)); + dcHandle.Rectangle(&drawRect); - if(hWnd == this->commentSubEdit){ + } - - SetBkMode(hdc, TRANSPARENT); // wið§ß - SetBkColor(hdc,this->editBkColor); // eLXgª©êÄ¢éªÌeLXgÌwiÌF - - return (LRESULT)editBkBrush.m_hBrush; + return; } - return 0; -} + LRESULT CCommentWriteWindow::OnEraseBkGnd(HDC wParam){ -LRESULT CCommentWriteWindow::OnButton(UINT hiWparam,INT_PTR loWparam,HWND lParam){ + return TRUE; + } - if(lParam == commentWriteButton){ - - this->SendChat(); - } else if(lParam == this->ownerModeButton){ + LRESULT CCommentWriteWindow::OnCtlolorEdit(HDC hdc,HWND hWnd){ - if(this->ownerModeButton.GetCheck() == BST_CHECKED){ + if(hWnd == this->commentSubEdit){ - this->editBkColor = OWNEREDITCOLOR; - } else { + SetBkMode(hdc, TRANSPARENT); // wið§ß + SetBkColor(hdc,this->editBkColor); // eLXgª©êÄ¢éªÌeLXgÌwiÌF - this->editBkColor = NORMALEDITCOLOR; + return (LRESULT)editBkBrush.m_hBrush; } - if(this->editBkBrush.IsNull() == FALSE){ + return 0; + } + + LRESULT CCommentWriteWindow::OnButton(UINT hiWparam,INT_PTR loWparam,HWND lParam){ + + if(lParam == commentWriteButton){ + + this->SendChat(); + + } else if(lParam == this->ownerModeButton){ - this->editBkBrush.DeleteObject(); + if(this->ownerModeButton.GetCheck() == BST_CHECKED){ + + this->editBkColor = OWNEREDITCOLOR; + + } else { + + this->editBkColor = NORMALEDITCOLOR; + } + + if(this->editBkBrush.IsNull() == FALSE){ + + this->editBkBrush.DeleteObject(); + + } + + this->editBkBrush.CreateSolidBrush(editBkColor); + commentSubEdit.Invalidate(); } - this->editBkBrush.CreateSolidBrush(editBkColor); - commentSubEdit.Invalidate(); - + return TRUE; } - return TRUE; -} + VOID CCommentWriteWindow::OnTimer(UINT id){ + streamTime++; + this->Invalidate(); -VOID CCommentWriteWindow::OnTimer(UINT id){ - streamTime++; - this->Invalidate(); + return; + } - return; -} + VOID CCommentWriteWindow::OnMeasureItem(UINT wParam,LPMEASUREITEMSTRUCT lParam){ -VOID CCommentWriteWindow::OnMeasureItem(UINT wParam,LPMEASUREITEMSTRUCT lParam){ + switch(lParam->CtlID){ - switch(lParam->CtlID){ + case COMMENTCOLOR_BOX: + { + SIZE itemSize; + CPaintDC pdc(*this); + pdc.SelectFont(AtlGetDefaultGuiFont()); + LPCTSTR sample = TEXT(" "); + ::GetTextExtentPoint32(pdc,sample,_tcslen(sample),&itemSize); + lParam->itemHeight = itemSize.cy; - case COMMENTCOLOR_BOX: - { - SIZE itemSize; - CPaintDC pdc(*this); - pdc.SelectFont(AtlGetDefaultGuiFont()); - LPCTSTR sample = TEXT(" "); - ::GetTextExtentPoint32(pdc,sample,_tcslen(sample),&itemSize); - lParam->itemHeight = itemSize.cy; + } + break; } - break; + + + return; } - - return; -} + VOID CCommentWriteWindow::OnSendChatResult(){ + + commentSubEdit.AgreeEnter(); + return; + } + -VOID CCommentWriteWindow::OnSendChatResult(){ + VOID CCommentWriteWindow::OnHeartBeat(NicoLiveHeartBeat_P heartBeat){ - commentSubEdit.AgreeEnter(); - return; -} + if(heartBeat->status == NLIB_ERR_OK){ + streamTime = heartBeat->time; + } + return; + } -VOID CCommentWriteWindow::OnHeartBeat(NicoLiveHeartBeat_P heartBeat){ + VOID CCommentWriteWindow::OnDisConnect(){ - if(heartBeat->status == NLIB_ERR_OK){ - streamTime = heartBeat->time; + this->KillTimer(TIMER_ID); + return; } - return; -} -VOID CCommentWriteWindow::OnDisConnect(){ + // + //CSubChatEditNX + ////////////////////////////////////////////////////////////////////////////////////// - this->KillTimer(TIMER_ID); + void CSubChatEdit::OnKeyDown(TCHAR wParam, UINT upLParam,UINT loLParam){ + if(wParam == VK_RETURN){ - return; -} + cs.Lock(); + if(untilConnectingFlag == FALSE){ -// -//CSubChatEditNX -////////////////////////////////////////////////////////////////////////////////////// -void CSubChatEdit::OnKeyDown(TCHAR wParam, UINT upLParam,UINT loLParam){ - if(wParam == VK_RETURN){ - - cs.Lock(); - - if(untilConnectingFlag == FALSE){ - - - self.SendChat(); + self.SendChat(); + } + + cs.Unlock(); + + } - - cs.Unlock(); - - + return; } - return; -} -VOID CSubChatEdit::AgreeEnter(){ - cs.Lock(); - this->SetReadOnly(FALSE); - untilConnectingFlag = FALSE; - cs.Unlock(); -} + VOID CSubChatEdit::AgreeEnter(){ + cs.Lock(); + this->SetReadOnly(FALSE); + untilConnectingFlag = FALSE; + cs.Unlock(); + } } \ No newline at end of file diff --git a/nlite/nlite_commentview.cpp b/nlite/nlite_commentview.cpp index c40824e..51c276c 100644 --- a/nlite/nlite_commentview.cpp +++ b/nlite/nlite_commentview.cpp @@ -1303,6 +1303,7 @@ end: VOID CCommentListWindow::CalcItemHeight(CChatData &chatData){ + if(chatData.viewData.height == 0){ RECT drowSize; self.m_header.GetItemRect(CCommentView::COMMENT,&drowSize); @@ -1328,13 +1329,6 @@ end: LRESULT CCommentListWindow::OnCreate(LPCREATESTRUCT lpCreateStruct){ - - //CComPtr iu; - //::AtlAxCreateControlEx(TEXT("MSHTML:"),*this,(IStream*)NULL,(IUnknown**)NULL,&iu,GUID_NULL); - - //iu->QueryInterface(DIID_DWebBrowserEvents2,&addToMyListWindow); - RECT rc = {0,0,300,200}; -// addToMyListWindow.Create(m_hWnd, &rc,_T("Shell.Explorer.2"),WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN , 0); return 0; } @@ -1416,8 +1410,6 @@ end: VOID CCommentListWindow::OnDestroy(){ -// this->addToMyListWindow.DestroyWindow(); - } VOID CCommentListWindow::OnLButtonDown(UINT wParam, _WTYPES_NS::CPoint &point){ -- 2.11.0