From 578eb911a9fa0b2d37cc05ae757755f05d7225d0 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Fri, 19 Aug 2022 21:22:12 +0200 Subject: [PATCH] Fixed issue #3953: Disabling ShowListFullPathTooltip doesn't hide tooltips in Changed Files dialog Signed-off-by: Sven Strickroth --- src/Changelog.txt | 1 + src/TortoiseProc/FileDiffDlg.cpp | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Changelog.txt b/src/Changelog.txt index fa9716afb..60d874fc9 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -35,6 +35,7 @@ Released: unreleased * Fixed issue #3906: Pull dialog always defaults to the wrong branch in submodules * Fixed issue #3897: Bisect refs are incorrect when working with worktrees * Fixed issue #3952: Log window wrong branch after cherry pick if switched after log window brought up + * Fixed issue #3953: Disabling ShowListFullPathTooltip doesn't hide tooltips in Changed Files dialog = Release 2.13.0.1 = Released: 2022-02-06 diff --git a/src/TortoiseProc/FileDiffDlg.cpp b/src/TortoiseProc/FileDiffDlg.cpp index b8c6e8cb9..a5c2a0696 100644 --- a/src/TortoiseProc/FileDiffDlg.cpp +++ b/src/TortoiseProc/FileDiffDlg.cpp @@ -486,15 +486,15 @@ void CFileDiffDlg::OnNMDblclkFilelist(NMHDR *pNMHDR, LRESULT *pResult) void CFileDiffDlg::OnLvnGetInfoTipFilelist(NMHDR *pNMHDR, LRESULT *pResult) { + *pResult = 0; + LPNMLVGETINFOTIP pGetInfoTip = reinterpret_cast(pNMHDR); - if (pGetInfoTip->iItem >= static_cast(m_arFilteredList.size())) + if (pGetInfoTip->iItem >= static_cast(m_arFilteredList.size()) || CRegDWORD(L"Software\\TortoiseGit\\ShowListFullPathTooltip", TRUE) != TRUE) return; CString path = m_path.GetGitPathString() + L'/' + m_arFilteredList[pGetInfoTip->iItem]->GetGitPathString(); if (pGetInfoTip->cchTextMax > path.GetLength()) wcsncpy_s(pGetInfoTip->pszText, pGetInfoTip->cchTextMax, path, pGetInfoTip->cchTextMax - 1); - - *pResult = 0; } void CFileDiffDlg::OnNMCustomdrawFilelist(NMHDR *pNMHDR, LRESULT *pResult) -- 2.11.4.GIT