Do not straighten if (expecting) too many lanes

gitextensions · Mar 26, 2021 · db99fe5 · db99fe5
1 parent 23c37d9
commit db99fe5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/GitUI/UserControls/RevisionGrid/Columns/RevisionGraphColumnProvider.cs b/GitUI/UserControls/RevisionGrid/Columns/RevisionGraphColumnProvider.cs
@@ -15,7 +15,7 @@ namespace GitUI.UserControls.RevisionGrid.Columns
 {
     internal sealed class RevisionGraphColumnProvider : ColumnProvider
     {
-        private const int MaxLanes = 40;
+        private const int MaxLanes = RevisionGraph.MaxLanes;
 
         private static readonly int LaneLineWidth = DpiUtil.Scale(2);
         private static readonly int LaneWidth = DpiUtil.Scale(16);

diff --git a/GitUI/UserControls/RevisionGrid/Graph/RevisionGraph.cs b/GitUI/UserControls/RevisionGrid/Graph/RevisionGraph.cs
@@ -15,6 +15,7 @@ internal interface IRevisionGraphRowProvider
     // The RevisionGraph contains all the basic structures needed to render the graph.
     public class RevisionGraph : IRevisionGraphRowProvider
     {
+        public const int MaxLanes = 40;
         private const int _straightenLanesLookAhead = 1;
 
         // Some unordered collections with raw data
@@ -342,9 +343,15 @@ static void StraightenLanes(int startIndex, int lastIndex, IList<RevisionGraphRo
                 startIndex = Math.Max(1, startIndex);
                 for (int currentIndex = startIndex; currentIndex < lastIndex;)
                 {
+                    IRevisionGraphRow currentRow = localOrderedRowCache[currentIndex];
+                    if (currentRow.Segments.Count >= MaxLanes)
+                    {
+                        ++currentIndex;
+                        continue;
+                    }
+
                     bool moved = false;
                     IRevisionGraphRow previousRow = localOrderedRowCache[currentIndex - 1];
-                    IRevisionGraphRow currentRow = localOrderedRowCache[currentIndex];
                     IRevisionGraphRow nextRow = localOrderedRowCache[currentIndex + 1];
                     foreach (RevisionGraphSegment revisionGraphSegment in currentRow.Segments)
                     {