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

fix: wrong graph when there's only one commit

Browse source
This commit is contained in:
leo 2024-08-26 17:26:02 +08:00
parent ead2af7d65
commit 1dd782bc42
No known key found for this signature in database
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Models/CommitGraph.cs
View file

@ -191,6 +191,7 @@ namespace SourceGit.Models
} }
isMerged = isMerged || l.IsMerged; isMerged = isMerged || l.IsMerged;
major.IsMerged = isMerged;
} }
else else
{ {
@ -202,12 +203,17 @@ namespace SourceGit.Models
} }
// Create new curve for branch head // Create new curve for branch head
if (major == null && commit.Parents.Count > 0) if (major == null)
{ {
offsetX += UNIT_WIDTH; offsetX += UNIT_WIDTH;
if (commit.Parents.Count > 0)
{
major = new PathHelper(commit.Parents[0], isMerged, colorIdx, new Point(offsetX, offsetY)); major = new PathHelper(commit.Parents[0], isMerged, colorIdx, new Point(offsetX, offsetY));
unsolved.Add(major); unsolved.Add(major);
temp.Paths.Add(major.Path); temp.Paths.Add(major.Path);
}
colorIdx = (colorIdx + 1) % _penCount; colorIdx = (colorIdx + 1) % _penCount;
} }
@ -216,11 +222,9 @@ namespace SourceGit.Models
int dotColor = 0; int dotColor = 0;
if (major != null) if (major != null)
{ {
major.IsMerged = isMerged;
position = new Point(major.LastX, offsetY); position = new Point(major.LastX, offsetY);
dotColor = major.Path.Color; dotColor = major.Path.Color;
} }
Dot anchor = new Dot() { Center = position, Color = dotColor }; Dot anchor = new Dot() { Center = position, Color = dotColor };
if (commit.IsCurrentHead) if (commit.IsCurrentHead)
anchor.Type = DotType.Head; anchor.Type = DotType.Head;