gitextensions#5125 Tooltips for lanes of graph in RevisionGrid

drewnoakes · Jul 9, 2018 · 060de8b · 060de8b
1 parent 83e1204
commit 060de8b
Show file tree

Hide file tree

Showing 10 changed files with 69 additions and 17 deletions.
diff --git a/GitUI/UserControls/RevisionGrid/Columns/AuthorNameColumnProvider.cs b/GitUI/UserControls/RevisionGrid/Columns/AuthorNameColumnProvider.cs
@@ -44,7 +44,7 @@ public override void OnCellFormatting(DataGridViewCellFormattingEventArgs e, Git
             e.FormattingApplied = true;
         }
 
-        public override bool TryGetToolTip(GitRevision revision, out string toolTip)
+        public override bool TryGetToolTip(DataGridViewCellMouseEventArgs e, GitRevision revision, out string toolTip)
         {
             if (revision.ObjectId?.IsArtificial == true)
             {

diff --git a/GitUI/UserControls/RevisionGrid/Columns/BuildStatusColumnProvider.cs b/GitUI/UserControls/RevisionGrid/Columns/BuildStatusColumnProvider.cs
@@ -158,15 +158,15 @@ public override void OnCellFormatting(DataGridViewCellFormattingEventArgs e, Git
             e.FormattingApplied = true;
         }
 
-        public override bool TryGetToolTip(GitRevision revision, out string toolTip)
+        public override bool TryGetToolTip(DataGridViewCellMouseEventArgs e, GitRevision revision, out string toolTip)
         {
             if (revision.BuildStatus != null)
             {
                 toolTip = revision.BuildStatus.Description;
                 return true;
             }
 
-            return base.TryGetToolTip(revision, out toolTip);
+            return base.TryGetToolTip(e, revision, out toolTip);
         }
     }
 }
diff --git a/GitUI/UserControls/RevisionGrid/Columns/ColumnProvider.cs b/GitUI/UserControls/RevisionGrid/Columns/ColumnProvider.cs
@@ -38,7 +38,7 @@ public virtual void OnCellFormatting(DataGridViewCellFormattingEventArgs e, GitR
         /// <remarks>Returning <c>false</c> here will not stop a tool tip being automatically displayed for truncated text.</remarks>
         [ContractAnnotation("=>false,toolTip:null")]
         [ContractAnnotation("=>true,toolTip:notnull")]
-        public virtual bool TryGetToolTip(GitRevision revision, [CanBeNull] out string toolTip)
+        public virtual bool TryGetToolTip(DataGridViewCellMouseEventArgs e, GitRevision revision, [CanBeNull] out string toolTip)
         {
             toolTip = default;
             return false;

diff --git a/GitUI/UserControls/RevisionGrid/Columns/CommitIdColumnProvider.cs b/GitUI/UserControls/RevisionGrid/Columns/CommitIdColumnProvider.cs
@@ -58,7 +58,7 @@ public override void OnCellPainting(DataGridViewCellPaintingEventArgs e, GitRevi
             }
         }
 
-        public override bool TryGetToolTip(GitRevision revision, out string toolTip)
+        public override bool TryGetToolTip(DataGridViewCellMouseEventArgs e, GitRevision revision, out string toolTip)
         {
             if (revision.ObjectId?.IsArtificial == true)
             {

diff --git a/GitUI/UserControls/RevisionGrid/Columns/DateColumnProvider.cs b/GitUI/UserControls/RevisionGrid/Columns/DateColumnProvider.cs
@@ -58,7 +58,7 @@ string FormatDate(DateTime dt)
             }
         }
 
-        public override bool TryGetToolTip(GitRevision revision, out string toolTip)
+        public override bool TryGetToolTip(DataGridViewCellMouseEventArgs e, GitRevision revision, out string toolTip)
         {
             if (revision.ObjectId?.IsArtificial == true)
             {

diff --git a/GitUI/UserControls/RevisionGrid/Columns/GraphColumnProvider.cs b/GitUI/UserControls/RevisionGrid/Columns/GraphColumnProvider.cs
@@ -40,11 +40,11 @@ public override void Refresh()
                   !_grid.ShouldHideGraph(inclBranchFilter: false);
         }
 
-        public override bool TryGetToolTip(GitRevision revision, out string toolTip)
+        public override bool TryGetToolTip(DataGridViewCellMouseEventArgs e, GitRevision revision, out string toolTip)
         {
             if (!revision.IsArtificial)
             {
-                toolTip = revision.Guid;
+                toolTip = _gridView.GetLaneInfo(e.X - ColumnLeftMargin, e.RowIndex);
                 return true;
             }
 

diff --git a/GitUI/UserControls/RevisionGrid/Columns/MessageColumnProvider.cs b/GitUI/UserControls/RevisionGrid/Columns/MessageColumnProvider.cs
@@ -209,15 +209,15 @@ public override void OnCellFormatting(DataGridViewCellFormattingEventArgs e, Git
             e.FormattingApplied = true;
         }
 
-        public override bool TryGetToolTip(GitRevision revision, out string toolTip)
+        public override bool TryGetToolTip(DataGridViewCellMouseEventArgs e, GitRevision revision, out string toolTip)
         {
             if (!revision.IsArtificial && revision.HasMultiLineMessage)
             {
                 toolTip = revision.Body ?? revision.Subject + "\n\nFull message text is not present in older commits.\nSelect this commit to populate the full message.";
                 return true;
             }
 
-            return base.TryGetToolTip(revision, out toolTip);
+            return base.TryGetToolTip(e, revision, out toolTip);
         }
     }
 }
diff --git a/GitUI/UserControls/RevisionGrid/RevisionDataGridView.cs b/GitUI/UserControls/RevisionGrid/RevisionDataGridView.cs
@@ -425,6 +425,58 @@ public GitRevision GetRevision(int rowIndex)
             }
         }
 
+        public string GetLaneInfo(int x, int rowIndex)
+        {
+            int lane = x / _laneWidth;
+            var laneInfoText = new System.Text.StringBuilder();
+            lock (_graphModel)
+            {
+                Graph.ILaneRow laneRow = _graphModel[rowIndex];
+                if (laneRow != null)
+                {
+                    Node node = null;
+                    if (lane == laneRow.NodeLane)
+                    {
+                        node = laneRow.Node;
+                        if (!node.Data.IsArtificial)
+                        {
+                            laneInfoText.AppendLine(node.Data.Guid);
+                        }
+                    }
+                    else if (lane >= 0 && lane < laneRow.Count)
+                    {
+                        for (int laneInfoIndex = 0, laneInfoCount = laneRow.LaneInfoCount(lane); laneInfoIndex < laneInfoCount; ++laneInfoIndex)
+                        {
+                            // search for next node below this row
+                            Graph.LaneInfo laneInfo = laneRow[lane, laneInfoIndex];
+                            Junction firstJunction = laneInfo.Junctions.First();
+                            for (int nodeIndex = 0, nodeCount = firstJunction.NodeCount; nodeIndex < nodeCount; ++nodeIndex)
+                            {
+                                Node laneNode = firstJunction[nodeIndex];
+                                if (laneNode.Index > rowIndex)
+                                {
+                                    node = laneNode;
+                                    break; // from for (nodes)
+                                }
+                            }
+                        }
+                    }
+
+                    if (node != null)
+                    {
+                        if (laneInfoText.Length > 0)
+                        {
+                            laneInfoText.AppendLine();
+                        }
+
+                        laneInfoText.Append(node.Data.Subject);
+                    }
+                }
+            }
+
+            return laneInfoText.ToString();
+        }
+
         public void Prune()
         {
             lock (_graphModel)

diff --git a/GitUI/UserControls/RevisionGrid/RevisionGridControl.cs b/GitUI/UserControls/RevisionGrid/RevisionGridControl.cs
@@ -173,7 +173,7 @@ public RevisionGridControl()
             _gridView.MouseDoubleClick += OnGridViewDoubleClick;
             _gridView.MouseClick += OnGridViewMouseClick;
             _gridView.MouseEnter += (_, e) => _toolTipProvider.OnCellMouseEnter();
-            _gridView.CellMouseMove += (_, e) => _toolTipProvider.OnCellMouseMove(e.ColumnIndex, e.RowIndex);
+            _gridView.CellMouseMove += (_, e) => _toolTipProvider.OnCellMouseMove(e);
             _gridView.Loading += OnGridViewLoading;
 
             // Allow to drop patch file on revision grid

diff --git a/GitUI/UserControls/RevisionGrid/RevisionGridToolTipProvider.cs b/GitUI/UserControls/RevisionGrid/RevisionGridToolTipProvider.cs
@@ -23,9 +23,9 @@ public void OnCellMouseEnter()
             _toolTip.AutoPopDelay = 32767;
         }
 
-        public void OnCellMouseMove(int columnIndex, int rowIndex)
+        public void OnCellMouseMove(DataGridViewCellMouseEventArgs e)
         {
-            var revision = _gridView.GetRevision(rowIndex);
+            var revision = _gridView.GetRevision(e.RowIndex);
 
             if (revision == null)
             {
@@ -49,17 +49,17 @@ public void OnCellMouseMove(int columnIndex, int rowIndex)
 
             string GetToolTipText()
             {
-                if (_gridView.Columns[columnIndex].Tag is ColumnProvider provider &&
-                    provider.TryGetToolTip(revision, out var toolTip) &&
+                if (_gridView.Columns[e.ColumnIndex].Tag is ColumnProvider provider &&
+                    provider.TryGetToolTip(e, revision, out var toolTip) &&
                     !string.IsNullOrWhiteSpace(toolTip))
                 {
                     return toolTip;
                 }
 
-                if (_isTruncatedByCellPos.TryGetValue(new Point(columnIndex, rowIndex), out var showToolTip)
+                if (_isTruncatedByCellPos.TryGetValue(new Point(e.ColumnIndex, e.RowIndex), out var showToolTip)
                     && showToolTip)
                 {
-                    return _gridView.Rows[rowIndex].Cells[columnIndex].FormattedValue?.ToString() ?? "";
+                    return _gridView.Rows[e.RowIndex].Cells[e.ColumnIndex].FormattedValue?.ToString() ?? "";
                 }
 
                 // no tooltip unless always active or truncated