From 024c7d82ed37032473a8afeabaa63ab79a048159 Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Mon, 23 Jul 2018 14:11:49 +0300
Subject: [PATCH] Show tooltips above columns in the MultipleFileMergeDialog

In case of short branch names, they will repeat the table header, but if branch name is long it might be more convenient to see a tooltip instead of resizing columns.

Relates to IDEA-195517
---
 .../com/intellij/openapi/vcs/merge/MultipleFileMergeDialog.kt  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/merge/MultipleFileMergeDialog.kt b/platform/vcs-impl/src/com/intellij/openapi/vcs/merge/MultipleFileMergeDialog.kt
index d21f045a6d3f..bae9b81a2151 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/merge/MultipleFileMergeDialog.kt
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/merge/MultipleFileMergeDialog.kt
@@ -176,10 +176,11 @@ open class MultipleFileMergeDialog(
   }
 
   private class ColumnInfoAdapter(private val base: ColumnInfo<Any, Any>,
-                                  columnName: String) : ColumnInfo<DefaultMutableTreeNode, Any>(columnName) {
+                                  private val columnName: String) : ColumnInfo<DefaultMutableTreeNode, Any>(columnName) {
     override fun valueOf(node: DefaultMutableTreeNode) = (node.userObject as? VirtualFile)?.let { base.valueOf(it) }
     override fun getMaxStringValue() = base.maxStringValue
     override fun getAdditionalWidth() = base.additionalWidth
+    override fun getTooltipText() = base.tooltipText ?: columnName
   }
 
   private class MyTable(private val tableModel: ListTreeTableModelOnColumns) : TreeTable(tableModel) {