From bc636ef37f7478b8af8959875872d74273554518 Mon Sep 17 00:00:00 2001 From: Sup Yut Sum Date: Tue, 6 Nov 2012 22:02:21 +0800 Subject: [PATCH] Fixed issue #1511: Changed Files Dialog cannot show icons as folder for submodule Signed-off-by: Sup Yut Sum --- src/Changelog.txt | 1 + src/TortoiseProc/FileDiffDlg.cpp | 8 +++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Changelog.txt b/src/Changelog.txt index 589dc6d6a..6ea9bd0d8 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -26,6 +26,7 @@ Released: unreleased * Fixed issue #1470: Log Dialog: Selected item not remembered after refresh if item is one of the first 100 * Fixed issue #1499: Allow to show log if current HEAD and selected ref is orphan branch when show all branches checked * Fixed issue #1507: Submodule Diff Dialog should show dirty state only on working copy revision + * Fixed issue #1511: Changed Files Dialog cannot show icons as folder for submodule = Release 1.7.14.0 = Released: 2012-10-14 diff --git a/src/TortoiseProc/FileDiffDlg.cpp b/src/TortoiseProc/FileDiffDlg.cpp index 64322bea2..49b0b5d60 100644 --- a/src/TortoiseProc/FileDiffDlg.cpp +++ b/src/TortoiseProc/FileDiffDlg.cpp @@ -383,12 +383,10 @@ int CFileDiffDlg::AddEntry(const CTGitPath * fd) int index = m_cFileList.GetItemCount(); int icon_idx = 0; -// if (fd->node == svn_node_dir) -// icon_idx = m_nIconFolder; -// else - { + if (fd->IsDirectory()) + icon_idx = m_nIconFolder; + else icon_idx = SYS_IMAGE_LIST().GetPathIconIndex(fd->GetGitPathString()); - } ret = m_cFileList.InsertItem(index, fd->GetGitPathString(), icon_idx); m_cFileList.SetItemText(index, 1, ((CTGitPath*)fd)->GetActionName()); -- 2.11.4.GIT