, m_pStoreSelection(NULL)\r
, m_nSelectedFilter(LOGFILTER_ALL)\r
, m_bVista(false)\r
+ , m_bShowWC(false)\r
{\r
// use the default GUI font, create a copy of it and\r
// change the copy to BOLD (leave the rest of the font\r
m_IsIDReplaceAction=FALSE;\r
\r
m_wcRev.m_CommitHash=GIT_REV_ZERO;\r
- m_wcRev.m_Subject=_T("Working Copy");\r
+ m_wcRev.m_Subject=_T("Working dir changes");\r
+ m_wcRev.m_ParentHash.clear();\r
+ m_wcRev.m_Mark=_T('-');\r
+ m_wcRev.m_IsUpdateing=FALSE;\r
+ m_wcRev.m_IsFull = TRUE;\r
\r
m_hModifiedIcon = (HICON)LoadImage(AfxGetResourceHandle(), MAKEINTRESOURCE(IDI_ACTIONMODIFIED), IMAGE_ICON, 0, 0, LR_DEFAULTSIZE);\r
m_hReplacedIcon = (HICON)LoadImage(AfxGetResourceHandle(), MAKEINTRESOURCE(IDI_ACTIONREPLACED), IMAGE_ICON, 0, 0, LR_DEFAULTSIZE);\r
{\r
SetExtendedStyle(LVS_EX_FULLROWSELECT | LVS_EX_SUBITEMIMAGES);\r
// load the icons for the action columns\r
- m_Theme.SetWindowTheme(GetSafeHwnd(), L"Explorer", NULL);\r
+// m_Theme.Open(m_hWnd, L"ListView");\r
+ m_Theme.Open(m_hWnd, L"Explorer::ListView;ListView");\r
+ m_Theme.SetWindowTheme(m_hWnd, L"Explorer", NULL);\r
CHintListCtrl::PreSubclassWindow();\r
}\r
\r
{\r
CString temp;\r
\r
- int c = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;\r
+ int c = GetHeaderCtrl()->GetItemCount()-1;\r
\r
while (c>=0)\r
DeleteColumn(c--);\r
}\r
return FALSE;\r
}\r
+\r
void CGitLogListBase::FillBackGround(HDC hdc, int Index,CRect &rect)\r
{ \r
// HBRUSH brush;\r
GetItem(&rItem);\r
\r
GitRev* pLogEntry = (GitRev*)m_arShownList.GetAt(Index);\r
- HBRUSH brush;\r
+ HBRUSH brush = NULL;\r
\r
\r
if (m_Theme.IsAppThemed() && m_bVista)\r
{\r
- m_Theme.Open(m_hWnd, L"Explorer");\r
int state = LISS_NORMAL;\r
if (rItem.state & LVIS_SELECTED)\r
{\r
else if(pLogEntry->m_Action&CTGitPath::LOGACTIONS_REBASE_EDIT)\r
brush = ::CreateSolidBrush(RGB(200,200,128));\r
\r
- if (brush == NULL)\r
- return;\r
+ if(pLogEntry->m_CommitHash == GIT_REV_ZERO)\r
+ brush = ::CreateSolidBrush(RGB(200,200,128));\r
+ }\r
\r
+ if (brush != NULL)\r
+ {\r
::FillRect(hdc, &rect, brush);\r
::DeleteObject(brush);\r
-\r
}\r
-\r
- if (m_Theme.IsBackgroundPartiallyTransparent(LVP_LISTDETAIL, state))\r
- m_Theme.DrawParentBackground(m_hWnd, hdc, &rect);\r
else\r
- m_Theme.DrawBackground(hdc, LVP_LISTDETAIL, state, &rect, NULL);\r
+ {\r
+ if (m_Theme.IsBackgroundPartiallyTransparent(LVP_LISTITEM, state))\r
+ m_Theme.DrawParentBackground(m_hWnd, hdc, &rect);\r
+\r
+ CRect rectDraw = rect;\r
+ if(rItem.state & LVIS_SELECTED)\r
+ rectDraw.InflateRect(1,0);\r
+ else\r
+ rectDraw.InflateRect(1,1);\r
+\r
+ m_Theme.DrawBackground(hdc, LVP_LISTITEM, state, rectDraw, &rect);\r
+ }\r
}\r
else\r
{\r
brush = ::CreateSolidBrush(RGB(156,156,156));\r
else if(pLogEntry->m_Action&CTGitPath::LOGACTIONS_REBASE_EDIT)\r
brush = ::CreateSolidBrush(RGB(200,200,128));\r
- else \r
+ else if(pLogEntry->m_CommitHash == GIT_REV_ZERO)\r
+ brush = ::CreateSolidBrush(RGB(200,200,128));\r
+ else\r
brush = ::CreateSolidBrush(::GetSysColor(COLOR_WINDOW));\r
}\r
if (brush == NULL)\r
str=m_HashMap[data->m_CommitHash][i];\r
\r
CString shortname;\r
- HBRUSH brush=0;\r
- shortname=_T("");\r
+ HBRUSH brush = 0;\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
- brush = ::CreateSolidBrush(m_Colors.GetColor(CColors::CurrentBranch));\r
+ colRef = m_Colors.GetColor(CColors::CurrentBranch);\r
else\r
- brush = ::CreateSolidBrush(m_Colors.GetColor(CColors::LocalBranch));\r
+ colRef = m_Colors.GetColor(CColors::LocalBranch);\r
\r
}else if(GetShortName(str,shortname,_T("refs/remotes/")))\r
{\r
- brush = ::CreateSolidBrush(m_Colors.GetColor(CColors::RemoteBranch));\r
+ colRef = m_Colors.GetColor(CColors::RemoteBranch);\r
}\r
else if(GetShortName(str,shortname,_T("refs/tags/")))\r
{\r
- brush = ::CreateSolidBrush(m_Colors.GetColor(CColors::Tag));\r
+ colRef = m_Colors.GetColor(CColors::Tag);\r
}\r
else if(GetShortName(str,shortname,_T("refs/stash")))\r
{\r
- brush = ::CreateSolidBrush(m_Colors.GetColor(CColors::Stash));\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
if(!shortname.IsEmpty())\r
GetTextExtentPoint32(hdc, shortname,shortname.GetLength(),&size);\r
\r
rt.SetRect(rt.left,rt.top,rt.left+size.cx,rt.bottom);\r
- rt.right+=4;\r
+ rt.right+=8;\r
+\r
+ //Fill interior of ref label\r
::FillRect(hdc, &rt, brush);\r
- if (rItem.state & LVIS_SELECTED)\r
+\r
+ //Draw edge of label\r
+ CDC W_Dc;\r
+ W_Dc.Attach(hdc);\r
+\r
+ CRect rectEdge = rt;\r
+\r
+ W_Dc.Draw3dRect(rectEdge, m_Colors.Lighten(colRef,100), m_Colors.Darken(colRef,100));\r
+ rectEdge.DeflateRect(1,1);\r
+ W_Dc.Draw3dRect(rectEdge, m_Colors.Lighten(colRef,50), m_Colors.Darken(colRef,50));\r
+\r
+ W_Dc.Detach();\r
+\r
+ //Draw text inside label\r
+ if (m_Theme.IsAppThemed() && m_bVista)\r
{\r
- COLORREF clrOld = ::SetTextColor(hdc,::GetSysColor(COLOR_HIGHLIGHTTEXT)); \r
- ::DrawText(hdc,shortname,shortname.GetLength(),&rt,DT_CENTER);\r
- ::SetTextColor(hdc,clrOld); \r
- }else\r
+ int txtState = LISS_NORMAL;\r
+ if (rItem.state & LVIS_SELECTED)\r
+ txtState = LISS_SELECTED;\r
+\r
+ m_Theme.DrawText(hdc, LVP_LISTITEM, txtState, shortname, -1, DT_CENTER | DT_SINGLELINE | DT_VCENTER, 0, &rt);\r
+ }\r
+ else\r
{\r
- ::DrawText(hdc,shortname,shortname.GetLength(),&rt,DT_CENTER);\r
+ if (rItem.state & LVIS_SELECTED)\r
+ {\r
+ COLORREF clrNew = ::GetSysColor(COLOR_HIGHLIGHTTEXT);\r
+ COLORREF clrOld = ::SetTextColor(hdc,clrNew); \r
+ ::DrawText(hdc,shortname,shortname.GetLength(),&rt,DT_CENTER | DT_SINGLELINE | DT_VCENTER);\r
+ ::SetTextColor(hdc,clrOld);\r
+ }else\r
+ {\r
+ ::DrawText(hdc,shortname,shortname.GetLength(),&rt,DT_CENTER | DT_SINGLELINE | DT_VCENTER);\r
+ }\r
}\r
\r
\r
- ::MoveToEx(hdc,rt.left,rt.top,NULL);\r
- ::LineTo(hdc,rt.right,rt.top);\r
- ::LineTo(hdc,rt.right,rt.bottom);\r
- ::LineTo(hdc,rt.left,rt.bottom);\r
- ::LineTo(hdc,rt.left,rt.top);\r
+ //::MoveToEx(hdc,rt.left,rt.top,NULL);\r
+ //::LineTo(hdc,rt.right,rt.top);\r
+ //::LineTo(hdc,rt.right,rt.bottom);\r
+ //::LineTo(hdc,rt.left,rt.bottom);\r
+ //::LineTo(hdc,rt.left,rt.top);\r
+\r
\r
- rt.left=rt.right+3;\r
+ rt.left=rt.right+1;\r
}\r
if(brush)\r
::DeleteObject(brush);\r
} \r
rt.right=rect.right;\r
\r
- if (rItem.state & LVIS_SELECTED)\r
+ if (m_Theme.IsAppThemed() && m_bVista)\r
{\r
- COLORREF clrOld = ::SetTextColor(hdc,::GetSysColor(COLOR_HIGHLIGHTTEXT)); \r
- ::DrawText(hdc,data->m_Subject,data->m_Subject.GetLength(),&rt,DT_LEFT);\r
- ::SetTextColor(hdc,clrOld); \r
- }else\r
+ int txtState = LISS_NORMAL;\r
+ if (rItem.state & LVIS_SELECTED)\r
+ txtState = LISS_SELECTED;\r
+\r
+ m_Theme.DrawText(hdc, LVP_LISTITEM, txtState, data->m_Subject, -1, DT_LEFT | DT_SINGLELINE | DT_VCENTER, 0, &rt);\r
+ }\r
+ else\r
{\r
- ::DrawText(hdc,data->m_Subject,data->m_Subject.GetLength(),&rt,DT_LEFT);\r
+ if (rItem.state & LVIS_SELECTED)\r
+ {\r
+ COLORREF clrOld = ::SetTextColor(hdc,::GetSysColor(COLOR_HIGHLIGHTTEXT)); \r
+ ::DrawText(hdc,data->m_Subject,data->m_Subject.GetLength(),&rt,DT_LEFT | DT_SINGLELINE | DT_VCENTER);\r
+ ::SetTextColor(hdc,clrOld); \r
+ }else\r
+ {\r
+ ::DrawText(hdc,data->m_Subject,data->m_Subject.GetLength(),&rt,DT_LEFT | DT_SINGLELINE | DT_VCENTER);\r
+ }\r
}\r
- \r
}\r
\r
static COLORREF blend(const COLORREF& col1, const COLORREF& col2, int amount = 128) {\r
continue;\r
\r
COLORREF color = i == activeLane ? activeColor : m_LineColors[i % Lanes::COLORS_NUM];\r
- paintGraphLane(hdc, rect.Height(),ln, x1, x2, color,activeColor, rect.top);\r
+ paintGraphLane(hdc, rect.Height(),ln, x1+rect.left, x2+rect.left, color,activeColor, rect.top);\r
}\r
\r
#if 0\r
}\r
#endif\r
\r
- TRACE(_T("index %d %d\r\n"),index,data->m_Lanes.size());\r
}\r
\r
void CGitLogListBase::OnNMCustomdrawLoglist(NMHDR *pNMHDR, LRESULT *pResult)\r
pLVCD->clrTextBk = RGB(156,156,156);\r
else if(data->m_Action&CTGitPath::LOGACTIONS_REBASE_EDIT)\r
pLVCD->clrTextBk = RGB(200,200,128);\r
- else \r
+ else if(data->m_CommitHash == GIT_REV_ZERO)\r
+ pLVCD->clrTextBk = RGB(200,200,128);\r
+ else\r
pLVCD->clrTextBk = ::GetSysColor(COLOR_WINDOW);\r
\r
if(data->m_Action&CTGitPath::LOGACTIONS_REBASE_CURRENT)\r
\r
// if ((data->childStackDepth)||(m_mergedRevs.find(data->Rev) != m_mergedRevs.end()))\r
// crText = GetSysColor(COLOR_GRAYTEXT);\r
-// if (data->Rev == m_wcRev)\r
-// {\r
-// SelectObject(pLVCD->nmcd.hdc, m_boldFont);\r
+// \r
+ if (data->m_CommitHash == GIT_REV_ZERO)\r
+ {\r
+ //crText = GetSysColor(COLOR_GRAYTEXT);\r
+ SelectObject(pLVCD->nmcd.hdc, m_boldFont);\r
// We changed the font, so we're returning CDRF_NEWFONT. This\r
// tells the control to recalculate the extent of the text.\r
-// *pResult = CDRF_NOTIFYSUBITEMDRAW | CDRF_NEWFONT;\r
-// }\r
+ *pResult = CDRF_NOTIFYSUBITEMDRAW | CDRF_NEWFONT;\r
+ }\r
}\r
}\r
if (m_arShownList.GetCount() == (INT_PTR)pLVCD->nmcd.dwItemSpec)\r
{\r
CRect rect;\r
GetSubItemRect(pLVCD->nmcd.dwItemSpec, pLVCD->iSubItem, LVIR_BOUNDS, rect);\r
+ if(pLVCD->iSubItem == 0)\r
+ {\r
+ CRect second;\r
+ GetSubItemRect(pLVCD->nmcd.dwItemSpec, pLVCD->iSubItem+1, LVIR_BOUNDS, second);\r
+ rect.right=second.left;\r
+ }\r
\r
+ TRACE(_T("A Graphic left %d right %d\r\n"),rect.left,rect.right);\r
FillBackGround(pLVCD->nmcd.hdc, (INT_PTR)pLVCD->nmcd.dwItemSpec,rect);\r
DrawGraph(pLVCD->nmcd.hdc,rect,pLVCD->nmcd.dwItemSpec);\r
\r
return;\r
\r
}\r
- }\r
+\r
+ } \r
}\r
\r
if (pLVCD->iSubItem == 1)\r
GitRev* pLogEntry = reinterpret_cast<GitRev *>(m_arShownList.GetAt(pLVCD->nmcd.dwItemSpec));\r
CRect rect;\r
GetSubItemRect(pLVCD->nmcd.dwItemSpec, pLVCD->iSubItem, LVIR_BOUNDS, rect);\r
+ TRACE(_T("Action left %d right %d\r\n"),rect.left,rect.right);\r
// Get the selected state of the\r
// item being drawn. \r
\r
{\r
\r
if(m_ContextMenuMask&GetContextMenuBit(ID_REBASE_PICK))\r
- popup.AppendMenuIcon(ID_REBASE_PICK, IDS_REBASE_SKIP, IDI_PICK);\r
+ popup.AppendMenuIcon(ID_REBASE_PICK, IDS_REBASE_PICK, IDI_PICK);\r
\r
if(m_ContextMenuMask&GetContextMenuBit(ID_REBASE_SQUASH))\r
popup.AppendMenuIcon(ID_REBASE_SQUASH,IDS_REBASE_SQUASH, IDI_SQUASH);\r
if (GetSelectedCount() == 1)\r
{\r
{\r
- if (m_hasWC)\r
+ //if (m_hasWC)\r
{\r
if(m_ContextMenuMask&GetContextMenuBit(ID_COMPARE))\r
popup.AppendMenuIcon(ID_COMPARE, IDS_LOG_POPUP_COMPARE, IDI_DIFF);\r
if(m_ContextMenuMask&GetContextMenuBit(ID_CHERRY_PICK))\r
popup.AppendMenuIcon(ID_CHERRY_PICK, IDS_CHERRY_PICK_VERSION, IDI_EXPORT);\r
\r
- if(GetSelectedCount()<=2)\r
+ if(GetSelectedCount()<=2 || (IsSelectionContinuous() && GetSelectedCount() > 0))\r
if(m_ContextMenuMask&GetContextMenuBit(ID_CREATE_PATCH))\r
popup.AppendMenuIcon(ID_CREATE_PATCH, IDS_CREATE_PATCH, IDI_PATCH);\r
\r
mask = CGit::LOG_INFO_ONLY_HASH | CGit::LOG_INFO_BOUNDARY;\r
// if(this->m_bAllBranch)\r
mask |= m_ShowMask;\r
+ \r
+ if(m_bShowWC)\r
+ this->m_logEntries.insert(m_logEntries.begin(),this->m_wcRev);\r
\r
this->m_logEntries.FetchShortLog(path,m_StartRef,-1,mask);\r
- \r
+\r
//this->m_logEntries.ParserFromLog();\r
if(IsInWorkingThread())\r
PostMessage(LVM_SETITEMCOUNT, (WPARAM) this->m_logEntries.size(),(LPARAM) LVSICF_NOINVALIDATEALL);\r
\r
for(unsigned int i=0;i<m_logEntries.size();i++)\r
{\r
- m_logEntries[i].m_Subject=_T("parser...");\r
+ if(i>0 || m_logEntries[i].m_CommitHash != GIT_REV_ZERO)\r
+ m_logEntries[i].m_Subject=_T("parser...");\r
+\r
if(this->m_IsOldFirst)\r
{\r
this->m_arShownList.Add(&m_logEntries[m_logEntries.size()-1-i]);\r
{\r
CGitCall_FetchFullLogInfo fetcher(this);\r
int mask=\r
+ CGit::LOG_INFO_FULL_DIFF|\r
CGit::LOG_INFO_STAT|\r
CGit::LOG_INFO_FILESTATE|\r
CGit::LOG_INFO_DETECT_COPYRENAME|\r
int update=0;\r
for(int i=0;i<m_logEntries.size();i++)\r
{\r
+ if( i==0 && m_logEntries[i].m_CommitHash == GIT_REV_ZERO)\r
+ continue;\r
+\r
start=this->m_logEntries[i].ParserFromLog(m_logEntries.m_RawlogData,start);\r
m_logEntries.m_HashMap[m_logEntries[i].m_CommitHash]=i;\r
\r