From 11f035d19e3d86df867bf24061eaf62530e7342c Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Fri, 13 Mar 2015 02:43:23 +0100 Subject: [PATCH] Question mark loading icon might get over drawn Signed-off-by: Sven Strickroth --- src/TortoiseProc/GitLogListBase.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/TortoiseProc/GitLogListBase.cpp b/src/TortoiseProc/GitLogListBase.cpp index c70556eba..2b049f77a 100644 --- a/src/TortoiseProc/GitLogListBase.cpp +++ b/src/TortoiseProc/GitLogListBase.cpp @@ -1521,7 +1521,11 @@ void CGitLogListBase::OnNMCustomdrawLoglist(NMHDR *pNMHDR, LRESULT *pResult) int action = SafeGetAction(pLogEntry); if (!pLogEntry->m_IsDiffFiles) + { ::DrawIconEx(pLVCD->nmcd.hdc, rect.left + ICONITEMBORDER, rect.top, m_hFetchIcon, iconwidth, iconheight, 0, NULL, DI_NORMAL); + *pResult = CDRF_SKIPDEFAULT; + return; + } if (action & CTGitPath::LOGACTIONS_MODIFIED) ::DrawIconEx(pLVCD->nmcd.hdc, rect.left + ICONITEMBORDER, rect.top, m_hModifiedIcon, iconwidth, iconheight, 0, NULL, DI_NORMAL); @@ -4269,6 +4273,9 @@ CString CGitLogListBase::GetToolTipText(int nItem, int nSubItem) if (pLogEntry == nullptr) return CString(); + if (!pLogEntry->m_IsDiffFiles) + return CString(MAKEINTRESOURCE(IDS_PROC_LOG_FETCHINGFILES)); + CString sToolTipText; DWORD actions = SafeGetAction(pLogEntry); -- 2.11.4.GIT