From 0ecc1817f03bfb009288f590011aea24f8750283 Mon Sep 17 00:00:00 2001
From: Julia Beliaeva <Julia.Beliaeva@jetbrains.com>
Date: Tue, 23 Aug 2016 18:50:41 +0300
Subject: [PATCH] [vcs-log] labels in commit panel have the same height so that
 text is aligned across them

---
 .../com/intellij/vcs/log/ui/frame/CommitPanel.java   | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/CommitPanel.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/CommitPanel.java
index ced95ec9f823..d84c902cbd57 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/CommitPanel.java
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/CommitPanel.java
@@ -26,6 +26,7 @@ import com.intellij.ui.ColorUtil;
 import com.intellij.ui.UI;
 import com.intellij.ui.components.JBLabel;
 import com.intellij.ui.components.JBPanel;
+import com.intellij.ui.components.panels.Wrapper;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.text.DateFormatUtil;
 import com.intellij.util.ui.HtmlPanel;
@@ -499,6 +500,7 @@ class CommitPanel extends JBPanel {
       removeAll();
       int height =
         getFontMetrics(getCommitDetailsFont()).getHeight() + PADDING;
+      JBLabel firstLabel = null;
       for (Map.Entry<VcsRefType, Collection<VcsRef>> typeAndRefs : ContainerUtil.groupBy(myReferences, VcsRef::getType).entrySet()) {
         VcsRefType type = typeAndRefs.getKey();
         int index = 0;
@@ -515,7 +517,15 @@ class CommitPanel extends JBPanel {
           label.setFont(getCommitDetailsFont());
           label.setIconTextGap(0);
           label.setHorizontalAlignment(SwingConstants.LEFT);
-          add(label);
+          if (firstLabel == null) {
+            firstLabel = label;
+            add(label);
+          }
+          else {
+            Wrapper wrapper = new Wrapper(label);
+            wrapper.setVerticalSizeReferent(firstLabel);
+            add(wrapper);
+          }
           index++;
         }
       }