Add NO_SCROLL when update total size of list number.

[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / LogDlg.cpp

diff --git a/src/TortoiseProc/LogDlg.cpp b/src/TortoiseProc/LogDlg.cpp
index bde64e1..9c29a18 100644 (file)
--- a/src/TortoiseProc/LogDlg.cpp
+++ b/src/TortoiseProc/LogDlg.cpp
@@ -372,6 +372,13 @@ LRESULT CLogDlg::OnLogListLoading(WPARAM wParam, LPARAM /*lParam*/)
        }else if( cur == GITLOG_END)\r
        {\r
                \r
+               if(this->m_LogList.HasText())\r
+               {\r
+                       this->m_LogList.ClearText();\r
+                       //UpdateLogInfoLabel();\r
+               }\r
+\r
+#if 0\r
                //if (!m_bShowedAll)\r
                DialogEnableWindow(IDC_SHOWWHOLEPROJECT, TRUE);\r
 \r
@@ -388,7 +395,8 @@ LRESULT CLogDlg::OnLogListLoading(WPARAM wParam, LPARAM /*lParam*/)
                m_LogList.GetTimeRange(begin,end);\r
                m_DateFrom.SetTime(&begin);\r
                m_DateTo.SetTime(&end);\r
-               \r
+#endif\r
+\r
        }else\r
        {\r
                if(this->m_LogList.HasText())\r
@@ -519,7 +527,7 @@ void CLogDlg::FillLogMessageCtrl(bool bShow /* = true*/)
                }else\r
                {\r
                        // set the log message text\r
-                       pMsgView->SetWindowText(_T("Commit:")+pLogEntry->m_CommitHash+_T("\r\n\r\n"));\r
+                       pMsgView->SetWindowText(_T("Commit:")+pLogEntry->m_CommitHash.ToString()+_T("\r\n\r\n"));\r
                        // turn bug ID's into links if the bugtraq: properties have been set\r
                        // and we can find a match of those in the log message\r
                        \r
@@ -618,12 +626,13 @@ void CLogDlg::FillLogMessageCtrl(bool bShow /* = true*/)
 \r
 void CLogDlg::OnBnClickedRefresh()\r
 {\r
-       m_limit = 0;\r
+       \r
        Refresh (true);\r
 }\r
 \r
 void CLogDlg::Refresh (bool /*autoGoOnline*/)\r
 {\r
+       m_limit = 0;\r
        m_LogList.Refresh();\r
        FillLogMessageCtrl(false);\r
 }\r
@@ -1339,14 +1348,14 @@ void CLogDlg::DoDiffFromLog(INT_PTR selIndex, GitRev* rev1, GitRev* rev2, bool b
        file1.Format(_T("%s%s_%s%s"),\r
                                temppath,                                               \r
                                (*m_currentChangedArray)[selIndex].GetBaseFilename(),\r
-                               rev1->m_CommitHash.Left(6),\r
+                               rev1->m_CommitHash.ToString().Left(6),\r
                                (*m_currentChangedArray)[selIndex].GetFileExtension());\r
 \r
        CString file2;\r
        file2.Format(_T("%s\\%s_%s%s"),\r
                                temppath,                                               \r
                                (*m_currentChangedArray)[selIndex].GetBaseFilename(),\r
-                               rev2->m_CommitHash.Left(6),\r
+                               rev2->m_CommitHash.ToString().Left(6),\r
                                (*m_currentChangedArray)[selIndex].GetFileExtension());\r
 \r
        CString cmd;\r