[INTERNAL] width calculation rework *WIP*

Author: SeeSharpSoft

src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/table/CsvTableEditor.java

@@ -313,11 +313,13 @@ public Font getFont() {
         return EditorColorsManager.getInstance().getGlobalScheme().getFont(EditorFontType.PLAIN);
     }
 
-    public int getStringWidth(String text) {
+    public Dimension getPreferredCellSize(int row, int column) {
+        Object[][] data = getDataHandler().getCurrentState();
+        String text = data[row][column].toString();
         if (text == null) {
-            return -1;
+            return new Dimension();
         }
-        return getFont().getSize() * text.length();
+        return new Dimension(getFont().getSize() * text.length(), getPreferredRowHeight());
     }
 
     public final void resetAllColumnWidths() {
@@ -339,26 +341,16 @@ protected int[] calculateDistributedColumnWidths() {
         Map<Integer, CsvColumnInfo<PsiElement>> columnInfos = this.getColumnInfoMap().getColumnInfos();
         Object[][] data = getDataHandler().getCurrentState();
         int[] widths = new int[columnInfos.size()];
-        int maxWidth = 0;
         int tableAutoMaxColumnWidth = CsvEditorSettingsExternalizable.getInstance().getTableAutoMaxColumnWidth();
 
         for (Map.Entry<Integer, CsvColumnInfo<PsiElement>> columnInfoEntry : columnInfos.entrySet()) {
             CsvColumnInfo<PsiElement> columnInfo = columnInfoEntry.getValue();
-            int currentWidth = getStringWidth(data[columnInfo.getMaxLengthRowIndex()][columnInfo.getColumnIndex()].toString());
-            widths[columnInfoEntry.getKey()] = currentWidth;
-            if (currentWidth > maxWidth) {
-                maxWidth = currentWidth;
+            Dimension preferredDimension = getPreferredCellSize(columnInfo.getMaxLengthRowIndex(), columnInfo.getColumnIndex());
+            int currentWidth = preferredDimension.width;
+            if (tableAutoMaxColumnWidth != 0) {
+                currentWidth = Math.min(tableAutoMaxColumnWidth, currentWidth);
             }
-        }
-
-        if (tableAutoMaxColumnWidth == 0) {
-            tableAutoMaxColumnWidth = maxWidth;
-        } else {
-            tableAutoMaxColumnWidth = Math.min(tableAutoMaxColumnWidth, maxWidth);
-        }
-
-        for (int i = 0; i < widths.length; ++i) {
-            widths[i] = (int) (tableAutoMaxColumnWidth * ((double) widths[i] / (double) maxWidth));
+            widths[columnInfoEntry.getKey()] = currentWidth;
         }
 
         return widths;

src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/table/swing/CsvTableEditorMouseListener.java

@@ -25,7 +25,7 @@ public void mouseClicked(MouseEvent e) {
 
     protected void addCommonActions(JBPopupMenu popupMenu) {
         popupMenu.add(new JSeparator());
-        JMenuItem menuItem = new JMenuItem(csvTableEditor.lnkAdjustColumnWidth.getText(), csvTableEditor.lnkAdjustColumnWidth.getIcon());
+        JMenuItem menuItem = new JMenuItem(csvTableEditor.lnkAdjustColumnWidth.getText(), IconLoader.getIcon("/media/icons/adjust-column-width.png"));
         menuItem.addActionListener(csvTableEditor.tableEditorActions.adjustColumnWidthAction);
         popupMenu.add(menuItem);
         menuItem = new JMenuItem("Reset to default width", IconLoader.getIcon("/media/icons/reset-column-width.png"));

src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/table/swing/CsvTableEditorSwing.form

@@ -107,7 +107,6 @@
                   <component id="bdd04" class="com.intellij.ui.components.labels.LinkLabel" binding="lnkAdjustColumnWidth">
                     <constraints/>
                     <properties>
-                      <icon value="media/icons/adjust-column-width.png"/>
                       <text value="Adjust column width"/>
                     </properties>
                   </component>

src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/table/swing/CsvTableEditorSwing.java

@@ -35,7 +35,7 @@
 public class CsvTableEditorSwing extends CsvTableEditor implements TableDataChangeEvent.Listener {
 
     private static final int TOTAL_CELL_HEIGHT_SPACING = 3;
-    private static final int TOTAL_CELL_WIDTH_SPACING = 6;
+    private static final int TOTAL_CELL_WIDTH_SPACING = 10;
 
     private JBTable tblEditor;
     private JPanel panelMain;
@@ -482,11 +482,13 @@ private int getFontHeight() {
     }
 
     @Override
-    public int getStringWidth(String text) {
-        if (text == null) {
-            return -1;
-        }
-        return getTable().getFontMetrics(getTable().getFont()).stringWidth(text) + TOTAL_CELL_WIDTH_SPACING;
+    public Dimension getPreferredCellSize(int row, int column) {
+        JBTable table = getTable();
+        Component comp = table.prepareRenderer(table.getCellRenderer(row, column), row, column);
+//        rowHeight = Math.max(rowHeight, comp.getPreferredSize().height);
+//        getTable().getFont().getStringBounds()
+//        return getTable().getFontMetrics(getTable().getFont()).stringWidth(text) + TOTAL_CELL_WIDTH_SPACING;
+        return comp.getPreferredSize();
     }
 
     public void changeFontSize(int changeAmount) {