From 2aa1b7ccec83591476a8d2e81aa55f25d891cae4 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Sun, 17 Mar 2013 15:47:07 +0100 Subject: [PATCH] Fixed issue #1701: Changing commit order in rebase dialog doesn't auto scroll Signed-off-by: Sven Strickroth --- src/Changelog.txt | 1 + src/TortoiseProc/RebaseDlg.cpp | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/Changelog.txt b/src/Changelog.txt index 1b9df5dff..974768339 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -51,6 +51,7 @@ Released: unreleased * Fixed issue #1693: Cherry pick progress bar doesn't stay green * Fixed issue #1276: Cannot show diff of renamed file * Fixed issue #1696: Fetch from switch dialog does not refresh branches list + * Fixed issue #1701: Changing commit order in rebase dialog doesn't auto scroll = Release 1.8.1.0 = Released: 2013-02-07 diff --git a/src/TortoiseProc/RebaseDlg.cpp b/src/TortoiseProc/RebaseDlg.cpp index 7dc0518bd..e6daf3f14 100644 --- a/src/TortoiseProc/RebaseDlg.cpp +++ b/src/TortoiseProc/RebaseDlg.cpp @@ -1930,6 +1930,8 @@ void CRebaseDlg::OnBnClickedButtonUp2() } if (changed) { + pos = m_CommitList.GetFirstSelectedItemPosition(); + m_CommitList.EnsureVisible(m_CommitList.GetNextSelectedItem(pos), false); m_CommitList.RecalculateShownList(&m_CommitList.m_arShownList); m_CommitList.Invalidate(); m_CommitList.SetFocus(); @@ -1968,6 +1970,7 @@ void CRebaseDlg::OnBnClickedButtonDown2() changed = true; } } + m_CommitList.EnsureVisible(indexes[m_CommitList.GetSelectedCount() - 1] + 1, false); delete [] indexes; indexes = NULL; if (changed) -- 2.11.4.GIT