michael/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit.git synced 2024-12-23 20:47:25 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

optimize<CommitGraph>: better path for merge lines

Browse source
This commit is contained in:
leo 2021-05-21 11:49:21 +08:00
parent a78a73b924
commit a70152ee8a
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Views/Controls/CommitGraph.cs
View file

@ -1,6 +1,5 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Windows; using System.Windows;
using System.Windows.Media; using System.Windows.Media;
@ -57,7 +56,7 @@ namespace SourceGit.Views.Controls {
Add(new Point(LastX, LastY)); Add(new Point(LastX, LastY));
Add(new Point(x, y - HALF_HEIGHT)); Add(new Point(x, y - HALF_HEIGHT));
} else if (x < LastX) { } else if (x < LastX) {
Add(new Point(LastX, LastY + HALF_HEIGHT)); if (y > LastY + HALF_HEIGHT) Add(new Point(LastX, LastY + HALF_HEIGHT));
Add(new Point(x, y)); Add(new Point(x, y));
} }
@ -190,7 +189,14 @@ namespace SourceGit.Views.Controls {
temp.Links.Add(link); temp.Links.Add(link);
} else { } else {
offsetX += UNIT_WIDTH; offsetX += UNIT_WIDTH;
unsolved.Add(new LineHelper(commit.Parents[j], isMerged, colorIdx, position));
// 防止有下一个提交有ended线时，新的分支线与旧线重合
var l = new LineHelper(commit.Parents[j], isMerged, colorIdx, position);
l.Line.Points.Add(new Point(offsetX, position.Y + HALF_HEIGHT));
l.LastX = offsetX;
l.LastY = position.Y + HALF_HEIGHT;
unsolved.Add(l);
colorIdx++; colorIdx++;
} }
} }