From 269bb4a3ea6ce1e4cecc37ce760fca7aa17bfd46 Mon Sep 17 00:00:00 2001
From: Andre Hartmann <aha_1980@gmx.de>
Date: Sun, 1 Sep 2024 10:41:54 +0200
Subject: [PATCH] Git: InstantBlame: Improve tooltip appearance

* Improve commit/author/date layout
* Use the same colors as in diff description

Change-Id: Icc7b7c21cefa7aaca5c8a40a6d85cda30147afba
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
---
 src/plugins/git/instantblame.cpp | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/plugins/git/instantblame.cpp b/src/plugins/git/instantblame.cpp
index 473f0b0f1bd..f541f4b556d 100644
--- a/src/plugins/git/instantblame.cpp
+++ b/src/plugins/git/instantblame.cpp
@@ -111,24 +111,26 @@ bool BlameMark::addToolTipContent(QLayout *target) const
 
 QString BlameMark::toolTipText(const CommitInfo &info) const
 {
+    const ColorNames colors = GitClient::colorNames();
+
     QString result = QString(
                          "<table cellspacing=\"10\"><tr>"
-                         "  <td><a href=\"blame\">Blame %1</a></td>"
+                         "  <td><a href=\"blame\">Blame %2</a></td>"
                          "  <td><a href=\"blameParent\">Blame Parent</a></td>"
-                         "  <td><a href=\"showFile\">File at %1</a></td>"
-                         "  <td><a href=\"logLine\">Log for line %2</a></td>"
+                         "  <td><a href=\"showFile\">File at %2</a></td>"
+                         "  <td><a href=\"logLine\">Log for line %4</a></td>"
                          "</tr></table>"
                          "<p></p>"
                          "<table>"
-                         "  <tr><td>commit</td><td><a href=\"show\">%1</a></td></tr>"
-                         "  <tr><td>Author:</td><td>%3 &lt;%4&gt;</td></tr>"
-                         "  <tr><td>Date:</td><td>%5</td></tr>"
-                         "  <tr></tr>"
-                         "  <tr><td colspan='2' align='left'>%6</td></tr>"
-                         "</table>")
-                         .arg(info.sha1.left(8), QString::number(info.line),
-                              info.author, info.authorMail,
-                              info.authorTime.toString("yyyy-MM-dd hh:mm:ss"), info.summary);
+                         "  <tr><td>commit</td><td><a style=\"color: %1;\" href=\"show\">%3</a></td></tr>"
+                         "  <tr><td>Author:</td><td style=\"color: %5;\">%6 &lt;%7&gt;</td></tr>"
+                         "  <tr><td>Date:</td><td style=\"color: %8;\">%9</td></tr>"
+                         "</table>"
+                         "<p style=\"color: %10;\">%11</p>")
+                         .arg(colors.hash, info.sha1.left(8), info.sha1, QString::number(info.line),
+                              colors.author, info.author, info.authorMail,
+                              colors.date, info.authorTime.toString("yyyy-MM-dd hh:mm:ss"),
+                              colors.subject, info.summary);
 
     if (settings().instantBlameIgnoreSpaceChanges()
         || settings().instantBlameIgnoreLineMoves()) {