void SetColor(Colors col, COLORREF cr);\r
\r
//mixFactor: 0 -> baseColor, 255 -> newColor\r
- COLORREF MixColors(COLORREF baseColor, COLORREF newColor, unsigned char mixFactor);\r
+ static COLORREF MixColors(COLORREF baseColor, COLORREF newColor, unsigned char mixFactor);\r
\r
- COLORREF Lighten(COLORREF baseColor, unsigned char amount = 100);\r
- COLORREF Darken(COLORREF baseColor, unsigned char amount = 100);\r
+ static COLORREF Lighten(COLORREF baseColor, unsigned char amount = 100);\r
+ static COLORREF Darken(COLORREF baseColor, unsigned char amount = 100);\r
\r
struct COLOR_DATA\r
{\r
shortname = _T("");\r
COLORREF colRef = 0;\r
\r
+ //Determine label color\r
if(GetShortName(str,shortname,_T("refs/heads/")))\r
{\r
if( shortname == m_CurrentBranch )\r
colRef = m_Colors.GetColor(CColors::Stash);\r
shortname=_T("stash");\r
}\r
+\r
+ //When row selected, ajust label color\r
+ if (!(m_Theme.IsAppThemed() && m_bVista))\r
+ if (rItem.state & LVIS_SELECTED)\r
+ colRef = CColors::MixColors(colRef, ::GetSysColor(COLOR_HIGHLIGHT), 150);\r
+\r
brush = ::CreateSolidBrush(colRef);\r
\r
\r