From 66e2cbbb0b3f8fa7461992e71fcca5bf629d6d88 Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Mon, 23 Jul 2018 18:14:51 +0300
Subject: [PATCH] Give the file column in the MultipleFileMergeDialog more
 priority in case of narrow dialog

Follow-up: f01014ab
---
 .../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 bae9b81a2151..9ab1945f3859 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
@@ -36,6 +36,7 @@ import com.intellij.ui.treeStructure.treetable.TreeTable
 import com.intellij.ui.treeStructure.treetable.TreeTableModel
 import com.intellij.util.containers.Convertor
 import com.intellij.util.ui.ColumnInfo
+import com.intellij.util.ui.JBUI
 import com.intellij.util.ui.UIUtil
 import com.intellij.util.ui.tree.TreeUtil
 import org.jetbrains.annotations.NonNls
@@ -212,7 +213,7 @@ open class MultipleFileMergeDialog(
         size -= columnModel.getColumn(i).preferredWidth
       }
 
-      columnModel.getColumn(fileColumn).preferredWidth = size
+      columnModel.getColumn(fileColumn).preferredWidth = Math.max(size, JBUI.scale(200))
     }
 
     private fun calcColumnWidth(maxStringValue: String, columnInfo: ColumnInfo<Any, Any>): Int {