From ad85b1e35012fdfea9dab28298ed7daabce4eaa1 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 18 Jan 2012 12:48:50 +0900 Subject: [PATCH] 2012/01/18 12:48:50 --- nlite.suo | Bin 57344 -> 58880 bytes nlite/nlite.cpp | 11 +++-------- nlite/nlite.h | 2 -- nlite/nlite_commentWrite.cpp | 28 +++++++++++++++++++++------- nlite/nlite_commentWrite.h | 7 +++++-- nlite/nlite_mainframe.cpp | 4 ++-- 6 files changed, 31 insertions(+), 21 deletions(-) diff --git a/nlite.suo b/nlite.suo index 8b3cf3d5012a60fb12fcf3f0291ddb2d0cbc68b2..e8237d881a46785ed43ab305869b4ab4b0a62383 100644 GIT binary patch delta 3079 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 Z%lCWY`;*B3M+<@F+pvah!|+h1{1;CQz?J|2 diff --git a/nlite/nlite.cpp b/nlite/nlite.cpp index 3149405..a1340a2 100644 --- a/nlite/nlite.cpp +++ b/nlite/nlite.cpp @@ -6,8 +6,7 @@ CAppModule _Module; -SIZE nlite::commentWriteWindowSize; -const RECT nlite::COMMENTWRITEWINDOW_SEPARATEFSIZE = {5,5,5,5}; + const CApplicationInfo* nlite::appInfo = NULL; static TCHAR localAppDataPath[_MAX_PATH]; @@ -43,6 +42,7 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE, wnd.Initialize(localAppDataPath); wnd.CreateEx(0,0,WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN); + wnd.ShowWindow(nCmdShow); wnd.UpdateWindow(); @@ -98,12 +98,7 @@ static BOOL InitializeNlite(){ BOOL rslt = FALSE; try{ - CFont font; - font = AtlGetDefaultGuiFont(); - LOGFONT defaultFontLog; - font.GetLogFont(&defaultFontLog); - nlite::commentWriteWindowSize.cx = 0; - nlite::commentWriteWindowSize.cy = defaultFontLog.lfHeight == 0 ? 30 : defaultFontLog.lfHeight < 0 ? (( -1 * defaultFontLog.lfHeight) * 2) + nlite::COMMENTWRITEWINDOW_SEPARATEFSIZE.bottom + nlite::COMMENTWRITEWINDOW_SEPARATEFSIZE.top : (defaultFontLog.lfHeight * 2) + nlite::COMMENTWRITEWINDOW_SEPARATEFSIZE.bottom + nlite::COMMENTWRITEWINDOW_SEPARATEFSIZE.top; + nlite::appInfo = &CApplicationInfo::getInstance(); INT_PTR err; INT_PTR count = 0; diff --git a/nlite/nlite.h b/nlite/nlite.h index f042fd1..c059a79 100644 --- a/nlite/nlite.h +++ b/nlite/nlite.h @@ -8,8 +8,6 @@ namespace nlite{ class CListenerList; extern const CApplicationInfo* appInfo; - extern SIZE commentWriteWindowSize; - extern const RECT COMMENTWRITEWINDOW_SEPARATEFSIZE; extern CListenerList listenerList; diff --git a/nlite/nlite_commentWrite.cpp b/nlite/nlite_commentWrite.cpp index b3aef6a..f39a531 100644 --- a/nlite/nlite_commentWrite.cpp +++ b/nlite/nlite_commentWrite.cpp @@ -11,6 +11,12 @@ const static LPCTSTR ANONYMOUS_BOTTONSTRING = TEXT("184"); const static LPCTSTR WRITE_BOTTONSTRING = TEXT("‘‚«ž‚Ý"); +static const RECT COMMENTWRITEWINDOW_SEPARATEFSIZE = {5,5,5,5}; + + +CCommentWriteWindow::CCommentWriteWindow(): +commentWriteHeight(0) +{} LRESULT CCommentWriteWindow::OnCreate(LPCREATESTRUCT lpReateStruct){ @@ -31,7 +37,15 @@ LRESULT CCommentWriteWindow::OnCreate(LPCREATESTRUCT lpReateStruct){ commentWriteButton.SetFont(AtlGetDefaultGuiFont()); comment.SetWindowTextW(TEXT("")); - + + CFont font; + font = AtlGetDefaultGuiFont(); + CPaintDC pdc(*this); + SIZE thisSize; + LPCTSTR sample = TEXT("a‚ A"); + GetTextExtentPoint32(pdc,sample,_tcslen(sample),&thisSize); + commentWriteHeight = thisSize.cy + COMMENTWRITEWINDOW_SEPARATEFSIZE.top + COMMENTWRITEWINDOW_SEPARATEFSIZE.bottom; + return 0; } @@ -74,11 +88,11 @@ VOID CCommentWriteWindow::ChangeSize(SIZE &size){ commentWriteButton.GetIdealSize(&commentWriteButtonSize); anonymousButton.GetIdealSize(&commentAnonymousButtonSize); //ƒTƒCƒY•ÏXˆ— - commentPosBox.MoveWindow(COMMENTWRITEWINDOW_SEPARATEFSIZE.left,COMMENTWRITEWINDOW_SEPARATEFSIZE.top, commentPosBoxSize.cx,commentWriteWindowSize.cy - (COMMENTWRITEWINDOW_SEPARATEFSIZE.top + COMMENTWRITEWINDOW_SEPARATEFSIZE.bottom),TRUE); - commentSizeBox.MoveWindow((COMMENTWRITEWINDOW_SEPARATEFSIZE.left * 2) + COMMENTWRITEWINDOW_SEPARATEFSIZE.right + commentPosBoxSize.cx, COMMENTWRITEWINDOW_SEPARATEFSIZE.top, commentSizeBoxSize.cx,commentWriteWindowSize.cy - (COMMENTWRITEWINDOW_SEPARATEFSIZE.top + COMMENTWRITEWINDOW_SEPARATEFSIZE.bottom),TRUE); - commentColorBox.MoveWindow((COMMENTWRITEWINDOW_SEPARATEFSIZE.left * 3) + (COMMENTWRITEWINDOW_SEPARATEFSIZE.right * 2) + commentPosBoxSize.cx + commentSizeBoxSize.cx,COMMENTWRITEWINDOW_SEPARATEFSIZE.top,commentColorBoxSize.cx,commentWriteWindowSize.cy - (COMMENTWRITEWINDOW_SEPARATEFSIZE.top + COMMENTWRITEWINDOW_SEPARATEFSIZE.bottom),TRUE); - anonymousButton.MoveWindow((COMMENTWRITEWINDOW_SEPARATEFSIZE.left * 4) + (COMMENTWRITEWINDOW_SEPARATEFSIZE.right * 3) + commentPosBoxSize.cx + commentSizeBoxSize.cx + commentColorBoxSize.cx ,COMMENTWRITEWINDOW_SEPARATEFSIZE.top,commentAnonymousButtonSize.cx,commentWriteWindowSize.cy - (COMMENTWRITEWINDOW_SEPARATEFSIZE.top + COMMENTWRITEWINDOW_SEPARATEFSIZE.bottom),TRUE); - comment.MoveWindow((COMMENTWRITEWINDOW_SEPARATEFSIZE.left * 5) + (COMMENTWRITEWINDOW_SEPARATEFSIZE.right * 4) + commentPosBoxSize.cx + commentSizeBoxSize.cx + commentColorBoxSize.cx + commentAnonymousButtonSize.cx,COMMENTWRITEWINDOW_SEPARATEFSIZE.top,size.cx - (COMMENTWRITEWINDOW_SEPARATEFSIZE.left + (COMMENTWRITEWINDOW_SEPARATEFSIZE.right * 2) + commentWriteButtonSize.cx + ((COMMENTWRITEWINDOW_SEPARATEFSIZE.left * 5) + (COMMENTWRITEWINDOW_SEPARATEFSIZE.right * 4) + commentPosBoxSize.cx + commentSizeBoxSize.cx + commentColorBoxSize.cx + commentAnonymousButtonSize.cx)),commentWriteWindowSize.cy - (COMMENTWRITEWINDOW_SEPARATEFSIZE.top + COMMENTWRITEWINDOW_SEPARATEFSIZE.bottom),TRUE); - commentWriteButton.MoveWindow(size.cx - (commentWriteButtonSize.cx),COMMENTWRITEWINDOW_SEPARATEFSIZE.top,commentWriteButtonSize.cx - COMMENTWRITEWINDOW_SEPARATEFSIZE.right,commentWriteWindowSize.cy - (COMMENTWRITEWINDOW_SEPARATEFSIZE.top + COMMENTWRITEWINDOW_SEPARATEFSIZE.bottom),TRUE); + commentPosBox.MoveWindow(COMMENTWRITEWINDOW_SEPARATEFSIZE.left,COMMENTWRITEWINDOW_SEPARATEFSIZE.top, commentPosBoxSize.cx,commentWriteHeight - (COMMENTWRITEWINDOW_SEPARATEFSIZE.top + COMMENTWRITEWINDOW_SEPARATEFSIZE.bottom),TRUE); + commentSizeBox.MoveWindow((COMMENTWRITEWINDOW_SEPARATEFSIZE.left * 2) + COMMENTWRITEWINDOW_SEPARATEFSIZE.right + commentPosBoxSize.cx, COMMENTWRITEWINDOW_SEPARATEFSIZE.top, commentSizeBoxSize.cx,commentWriteHeight - (COMMENTWRITEWINDOW_SEPARATEFSIZE.top + COMMENTWRITEWINDOW_SEPARATEFSIZE.bottom),TRUE); + commentColorBox.MoveWindow((COMMENTWRITEWINDOW_SEPARATEFSIZE.left * 3) + (COMMENTWRITEWINDOW_SEPARATEFSIZE.right * 2) + commentPosBoxSize.cx + commentSizeBoxSize.cx,COMMENTWRITEWINDOW_SEPARATEFSIZE.top,commentColorBoxSize.cx,commentWriteHeight - (COMMENTWRITEWINDOW_SEPARATEFSIZE.top + COMMENTWRITEWINDOW_SEPARATEFSIZE.bottom),TRUE); + anonymousButton.MoveWindow((COMMENTWRITEWINDOW_SEPARATEFSIZE.left * 4) + (COMMENTWRITEWINDOW_SEPARATEFSIZE.right * 3) + commentPosBoxSize.cx + commentSizeBoxSize.cx + commentColorBoxSize.cx ,COMMENTWRITEWINDOW_SEPARATEFSIZE.top,commentAnonymousButtonSize.cx,commentWriteHeight - (COMMENTWRITEWINDOW_SEPARATEFSIZE.top + COMMENTWRITEWINDOW_SEPARATEFSIZE.bottom),TRUE); + comment.MoveWindow((COMMENTWRITEWINDOW_SEPARATEFSIZE.left * 5) + (COMMENTWRITEWINDOW_SEPARATEFSIZE.right * 4) + commentPosBoxSize.cx + commentSizeBoxSize.cx + commentColorBoxSize.cx + commentAnonymousButtonSize.cx,COMMENTWRITEWINDOW_SEPARATEFSIZE.top,size.cx - (COMMENTWRITEWINDOW_SEPARATEFSIZE.left + (COMMENTWRITEWINDOW_SEPARATEFSIZE.right * 2) + commentWriteButtonSize.cx + ((COMMENTWRITEWINDOW_SEPARATEFSIZE.left * 5) + (COMMENTWRITEWINDOW_SEPARATEFSIZE.right * 4) + commentPosBoxSize.cx + commentSizeBoxSize.cx + commentColorBoxSize.cx + commentAnonymousButtonSize.cx)),commentWriteHeight - (COMMENTWRITEWINDOW_SEPARATEFSIZE.top + COMMENTWRITEWINDOW_SEPARATEFSIZE.bottom),TRUE); + commentWriteButton.MoveWindow(size.cx - (commentWriteButtonSize.cx),COMMENTWRITEWINDOW_SEPARATEFSIZE.top,commentWriteButtonSize.cx - COMMENTWRITEWINDOW_SEPARATEFSIZE.right,commentWriteHeight - (COMMENTWRITEWINDOW_SEPARATEFSIZE.top + COMMENTWRITEWINDOW_SEPARATEFSIZE.bottom),TRUE); return; } \ No newline at end of file diff --git a/nlite/nlite_commentWrite.h b/nlite/nlite_commentWrite.h index 5909424..c02c3fb 100644 --- a/nlite/nlite_commentWrite.h +++ b/nlite/nlite_commentWrite.h @@ -15,7 +15,10 @@ namespace nlite{ CButton anonymousButton; CEdit comment; CButton commentWriteButton; - + + + public: + UINT_PTR commentWriteHeight; public: @@ -31,7 +34,7 @@ namespace nlite{ END_MSG_MAP() - + CCommentWriteWindow(); // //ƒƒbƒZ[ƒWƒnƒ“ƒhƒ‰ diff --git a/nlite/nlite_mainframe.cpp b/nlite/nlite_mainframe.cpp index 6286993..ad95865 100644 --- a/nlite/nlite_mainframe.cpp +++ b/nlite/nlite_mainframe.cpp @@ -15,7 +15,7 @@ VOID CNliteMainFrame::ChangeSize(const SIZE& client){ - INT_PTR tabheight = client.cy - (toolBarHeight + statusBarHeight + commentWriteWindowSize.cy); + INT_PTR tabheight = client.cy - (toolBarHeight + statusBarHeight + commentWriteWindow.commentWriteHeight); tabctrl.MoveWindow(0,toolBarHeight,client.cx,tabheight); @@ -34,7 +34,7 @@ VOID CNliteMainFrame::ChangeSize(const SIZE& client){ - ::SetWindowPos(m_hWndStatusBar,HWND_TOP,0,0,0,0,SWP_SHOWWINDOW); + ::SetWindowPos(commentWriteWindow,HWND_BOTTOM,0,0,0,0,SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW); //commentWriteWindow.MoveWindow(0,client.cy - (commentWriteWindowSize.cy + statusBarHeight),client.cx,client.cy - statusBarHeight); -- 2.11.0