From 0e10b42b977f1259cdfd722bbbd6ecbb18883016 Mon Sep 17 00:00:00 2001 From: Frank Li Date: Thu, 14 Oct 2010 21:40:41 +0800 Subject: [PATCH] Show bisect flag at log dialog Signed-off-by: Frank Li --- src/TortoiseProc/Colors.cpp | 2 ++ src/TortoiseProc/Colors.h | 2 ++ src/TortoiseProc/GitLogListBase.cpp | 13 +++++++++++++ 3 files changed, 17 insertions(+) diff --git a/src/TortoiseProc/Colors.cpp b/src/TortoiseProc/Colors.cpp index ecc3e878f..b2b871c91 100644 --- a/src/TortoiseProc/Colors.cpp +++ b/src/TortoiseProc/Colors.cpp @@ -47,6 +47,8 @@ CColors::COLOR_DATA CColors::m_ColorArray[]= {BranchLine6,_T("Software\\TortoiseGit\\Colors\\BranchLine6"), RGB(128,128,0)}, {BranchLine7,_T("Software\\TortoiseGit\\Colors\\BranchLine7"), RGB(0,128,128)}, {BranchLine8,_T("Software\\TortoiseGit\\Colors\\BranchLine8"), RGB(128,0,128)}, + {BisectGood,_T("Software\\TortoiseGit\\Colors\\BisectGood"), RGB(0,100,200)}, + {BisectBad, _T("Software\\TortoiseGit\\Colors\\BisectBad"), RGB(255,0,0)}, {COLOR_END,_T("Software\\TortoiseGit\\Colors\\END"),RGB(0,0,0)}, }; diff --git a/src/TortoiseProc/Colors.h b/src/TortoiseProc/Colors.h index 55f060715..85af01238 100644 --- a/src/TortoiseProc/Colors.h +++ b/src/TortoiseProc/Colors.h @@ -57,6 +57,8 @@ public: BranchLine6, BranchLine7, BranchLine8, + BisectGood, + BisectBad, COLOR_END=-1 }; diff --git a/src/TortoiseProc/GitLogListBase.cpp b/src/TortoiseProc/GitLogListBase.cpp index e5e54d566..0da604917 100644 --- a/src/TortoiseProc/GitLogListBase.cpp +++ b/src/TortoiseProc/GitLogListBase.cpp @@ -462,6 +462,19 @@ void CGitLogListBase::DrawTagBranch(HDC hdc,CRect &rect,INT_PTR index) { colRef = m_Colors.GetColor(CColors::Stash); shortname=_T("stash"); + }else if(GetShortName(str,shortname,_T("refs/bisect/"))) + { + if(shortname.Find(_T("good")) == 0) + { + colRef = m_Colors.GetColor(CColors::BisectGood); + shortname = _T("good"); + } + + if(shortname.Find(_T("bad")) == 0) + { + colRef = m_Colors.GetColor(CColors::BisectBad); + shortname = _T("bad"); + } } //When row selected, ajust label color -- 2.11.4.GIT