2012/01/18 12:48:50

diff --git a/nlite.suo b/nlite.suo
index 8b3cf3d..e8237d8 100644 (file)
Binary files a/nlite.suo and b/nlite.suo differ

diff --git a/nlite/nlite.cpp b/nlite/nlite.cpp
index 3149405..a1340a2 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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("\8f\91\82«\8d\9e\82Ý");
 
 
+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\82 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);
        //\83T\83C\83Y\95Ï\8dX\8f\88\97\9d
-       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 (file)
--- 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();
 
                //
                //\83\81\83b\83Z\81[\83W\83n\83\93\83h\83\89

diff --git a/nlite/nlite_mainframe.cpp b/nlite/nlite_mainframe.cpp
index 6286993..ad95865 100644 (file)
--- 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);