From 7ee4eb727bff4a08f6e73892b64926d70263e5f1 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 13 Feb 2012 11:51:20 +0900 Subject: [PATCH] =?utf8?q?=E4=B8=BB=E3=82=B3=E3=83=A1=E3=83=9C=E3=82=BF?= =?utf8?q?=E3=83=B3=E3=82=92=E5=AE=9F=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- nlite.suo | Bin 171008 -> 164352 bytes nlite/nlite.rc | 6 ++-- nlite/nlite_commentWrite.cpp | 84 +++++++++++++++++++++++-------------------- nlite/nlite_commentWrite.h | 6 ++-- 4 files changed, 52 insertions(+), 44 deletions(-) diff --git a/nlite.suo b/nlite.suo index e113851cb47c603d0bfecfd257afa72a636bae15..130169ea6daf112cef0e091e85711dc0316ae89e 100644 GIT binary patch delta 4685 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 delta 6110 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

@9aCQGmfY7Pl{4|`8 ze&(ly3{hR9O7P5BwkkirNAYPX^_NPB7c!dYVll&@AW}?$w-kNe8Ot{;TV7a{*Rw&5 z&pgkJ{O9K9tu0bdbwUwAreYDvagp)=d#@^6)n&a~m1j-La?gysf@Le$WfPxo zG7JbIv+GI(M`pm6G`m=sOp66)gz~xn&T5{Ud7k)Bk@twQ5yxo#AaNkXpoEh|o2npz z(?b0OHD|i#i9drw#j+_q`}lhv4+D?HpTd~jF?=CsK+k8jd!AUIE5tvCplav6UOPM9 zv9TlMepdH$;8ZvFXqDeRMkM|`Y?aN!efsSl$MexV2J~#d)R8byRbT42`#<;$56Rss znEUudW`MdpuXp+VcS?93ESLXuQY)LdqYlyz6Nx{QLdsf+3*pxPqhwOmxA&?KX#R_P z&W@7k|A(wmcUXIOaO=SHa2|;Rr{4eu^h>yYZrew0JWMw}kJ9+*KspO}VvY)7b zOvS$Z5QzgMZ@<0D+f_{)L?YKFcj)>Wl;=dbS5v;|($ks@5l7Q9#o78Sp?BF+gShowWindow(SW_SHOW); this->streamTime = threadComment->server_time; this->SetTimer(TIMER_ID,1000,NULL); - + if(nicoLiveStream.IsOwner() == TRUE){ + + this->ownerModeButton.ShowWindow(SW_SHOW); + + } else { + + this->ownerModeButton.ShowWindow(SW_HIDE); + + } return; @@ -431,14 +420,14 @@ VOID CCommentWriteWindow::ChangeSize(SIZE &size){ 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; @@ -457,14 +446,25 @@ VOID CCommentWriteWindow::ChangeSize(SIZE &size){ commentColorBoxRect.left = commentSizeBoxRect.right + COMMENTWRITEWINDOW_SIDESEPARATESIZE; commentColorBoxRect.right = commentColorBoxRect.left + commentColorBoxSize.cx; - CDC cdc(anonymousButton.GetDC()); - SIZE anonymousStringSize; - ::GetTextExtentPoint32(cdc,CHECKBUTTON_HIDDENSTRING,_tcslen(CHECKBUTTON_HIDDENSTRING),&anonymousStringSize); + anonymousButtonRect.left = commentColorBoxRect.right + COMMENTWRITEWINDOW_SIDESEPARATESIZE; - anonymousButtonRect.right = anonymousButtonRect.left + commentAnonymousButtonSize.cx - anonymousStringSize.cx; + anonymousButtonRect.right = anonymousButtonRect.left + commentAnonymousButtonSize.cx; - commentEditRect.left = anonymousButtonRect.right + COMMENTWRITEWINDOW_SIDESEPARATESIZE; + 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; + } commentWriteButtonRect.right = size.cx - COMMENTWRITEWINDOW_SIDESEPARATESIZE; commentWriteButtonRect.left = commentWriteButtonRect.right - commentWriteButtonSize.cx; @@ -474,7 +474,7 @@ VOID CCommentWriteWindow::ChangeSize(SIZE &size){ //ˆÚ“®ˆ— - HDWP hDwp = BeginDeferWindowPos(6); + HDWP hDwp = BeginDeferWindowPos(defwindowCount); commentPosBox.DeferWindowPos(hDwp,*this, commentPosBoxRect.left,writeSpaceHeight,commentPosBoxRect.right - commentPosBoxRect.left,commentWriteInternalHeight, @@ -489,9 +489,15 @@ VOID CCommentWriteWindow::ChangeSize(SIZE &size){ SWP_NOZORDER); anonymousButton.DeferWindowPos(hDwp,*this, - anonymousButtonRect.left,writeSpaceHeight,anonymousButtonRect.right - anonymousButtonRect.left,commentWriteInternalHeight - CHECKBUTTON_SUBSCRIPT_HEIGHT, + 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); diff --git a/nlite/nlite_commentWrite.h b/nlite/nlite_commentWrite.h index f3b14f4..734abb9 100644 --- a/nlite/nlite_commentWrite.h +++ b/nlite/nlite_commentWrite.h @@ -101,6 +101,7 @@ namespace nlite{ CComAutoCriticalSection commentSizeBoxCS; //ƒRƒƒ“ƒg‚Ì‘å‚«‚³‘I‘ðƒRƒ“ƒ{ƒ{ƒbƒNƒXƒNƒŠƒeƒBƒJƒ‹ƒZƒNƒVƒ‡ƒ“ CComboBox commentColorBox; //ƒRƒƒ“ƒgF‘I‘ðƒRƒ“ƒ{ƒ{ƒbƒNƒX CButton anonymousButton; //184‘I‘ðƒ{ƒ^ƒ“ + CButton ownerModeButton; //ŽåƒRƒ‘I‘ðƒ{ƒ^ƒ“ CSubChatEdit commentSubEdit; //ƒRƒƒ“ƒg‘‚«ž‚Ý—pƒGƒfƒBƒbƒgƒTƒuƒNƒ‰ƒX CButton commentWriteButton; //ƒRƒƒ“ƒg‘‚«ž‚݃{ƒ^ƒ“ UINT_PTR commentWriteMaxLength; //ƒRƒƒ“ƒg‘‚«ž‚Ý’·Å‘å’l @@ -109,7 +110,7 @@ namespace nlite{ UINT_PTR commentWriteInternalHeight; //ƒRƒƒ“ƒg‘‚«ž‚݃Rƒ“ƒgƒ[ƒ‹”z’u—̈æ‚̍‚‚³(“à•”) CNicoLiveStream &nicoLiveStream; //•ú‘—ƒIƒuƒWƒFƒNƒg‚ÌŽQÆ time_t streamTime; //•ú‘—Œo‰ßŽžŠÔ - CFont anonymousFont; //184•\Ž¦—pƒtƒHƒ“ƒg + CFont checkButtonFont; //184•\Ž¦—pƒtƒHƒ“ƒg CFont timeFont; //Œo‰ßŽžŠÔ•\Ž¦—pƒtƒHƒ“ƒg @@ -121,7 +122,8 @@ namespace nlite{ ANONYMOUS_BUTTON = 4, COMMENT_EDIT = 5, COMMENTWRITE_BOTTON = 6, - TIMER_ID = 7 + TIMER_ID = 7, + OWNERMODE_BUTTON = 5 }; -- 2.11.0