MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Give the file column in the MultipleFileMergeDialog more priority in case of narrow dialog

Browse Source 
Follow-up: f01014ab
This commit is contained in:
Kirill Likhodedov
2018-07-23 18:16:13 +03:00
parent c1cd227e56
commit 66e2cbbb0b
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/merge/MultipleFileMergeDialog.kt
+2 -1
View File
@@ -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 {