Commit 69fdf5b2 authored by Yue Lin Ho's avatar Yue Lin Ho

Fixed issue #2609: Start scrolling the log from the bottom of the window...

Fixed issue #2609: Start scrolling the log from the bottom of the window rather than the top when finishing the progress
Signed-off-by: Yue Lin Ho's avatarYue Lin Ho <b8732003@student.nsysu.edu.tw>
parent 8014a357
......@@ -12,6 +12,7 @@ Released: unreleased
* Added branch revision number for tracking of the source code version of a branch in automated builds using "git rev-list --count --first-parent"
* Allow to choose Git Credential Manager for Windows (GCM)
* Fixed issue #2604: Tag using TortoiseGitProc.exe /command:tag should accept a tag name argument
* Fixed issue #2609: Start scrolling the log from the bottom of the window rather than the top when finishing the progress
== Bug Fixes ==
* TortoiseGitMerge highlights wrong line in case of file starts with LF+CRLF
......
......@@ -356,7 +356,6 @@ LRESULT CProgressDlg::OnProgressUpdateUI(WPARAM wParam,LPARAM lParam)
m_Databuf.push_back(0);
m_Log.SetWindowText(Convert2UnionCode((char*)&m_Databuf[0]));
m_Databuf.m_critSec.Unlock();
m_Log.LineScroll(m_Log.GetLineCount() - m_Log.GetFirstVisibleLine() - 4);
}
m_BufStart=0;
m_Databuf.m_critSec.Lock();
......@@ -411,6 +410,8 @@ LRESULT CProgressDlg::OnProgressUpdateUI(WPARAM wParam,LPARAM lParam)
this->DialogEnableWindow(IDCANCEL,FALSE);
}
m_Log.PostMessage(WM_VSCROLL, SB_BOTTOM, 0);
if (wParam == MSG_PROGRESSDLG_END)
{
if (m_PostCmdCallback) // new handling method using callback
......@@ -561,7 +562,7 @@ void CProgressDlg::ParserCmdOutput(CRichEditCtrl &log,CProgressCtrl &progressctr
log.SetSel(0,end);
log.ReplaceSel(_T(""));
}
log.LineScroll(log.GetLineCount() - log.GetFirstVisibleLine() - 4);
log.PostMessage(WM_VSCROLL, SB_BOTTOM, 0);
int s1=oneline.ReverseFind(_T(':'));
int s2=oneline.Find(_T('%'));
......@@ -729,7 +730,6 @@ void CProgressDlg::InsertColorText(CRichEditCtrl &edit,CString text,COLORREF rgb
edit.SetSelectionCharFormat(cf);
edit.SetSel(edit.GetTextLength(),edit.GetTextLength());
edit.SetDefaultCharFormat(old);
edit.LineScroll(edit.GetLineCount() - edit.GetFirstVisibleLine() - 4);
}
CString CCommitProgressDlg::Convert2UnionCode(char *buff, int size)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment