[FIX] No fallback font used in table editor

Fixes #145

Author: SeeSharpSoft

CHANGELOG

@@ -1,3 +1,9 @@
+2.6.2
+Aug 09, 2019
+
+FIX: AssertionError: Already disposed: Project (Disposed) #147
+FIX: No fallback font used in table editor #145
+
 2.6.1
 Aug 01, 2019
 

gradle.properties

@@ -3,7 +3,7 @@
 # https://www.jetbrains.com/intellij-repository/snapshots
 
 name='CSV Plugin'
-pluginVersion=2.6.1
+pluginVersion=2.6.2
 javaVersion=1.8
 javaTargetVersion=1.8
 downloadIntellijSources=false

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

@@ -11,6 +11,7 @@
 import com.intellij.openapi.fileEditor.*;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Key;
+import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.UserDataHolder;
 import com.intellij.openapi.util.UserDataHolderBase;
 import com.intellij.openapi.vfs.ReadonlyStatusHandler;
@@ -30,6 +31,8 @@
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
+import javax.swing.plaf.FontUIResource;
+import javax.swing.text.StyleContext;
 import java.awt.*;
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
@@ -320,7 +323,15 @@ public final int getRowCount() {
     }
 
     public Font getFont() {
-        return EditorColorsManager.getInstance().getGlobalScheme().getFont(EditorFontType.PLAIN);
+        // the one-liner to be used requires 172.2465.6 - compatibility
+        // return UIUtil.getFontWithFallback(EditorColorsManager.getInstance().getGlobalScheme().getFont(EditorFontType.PLAIN));
+
+        Font font = EditorColorsManager.getInstance().getGlobalScheme().getFont(EditorFontType.PLAIN);
+        String familyName = font.getFamily();
+        int style = font.getStyle();
+        int size = font.getSize();
+        Font fontWithFallback = SystemInfo.isMac ? new Font(familyName, style, size) : (new StyleContext()).getFont(familyName, style, size);
+        return fontWithFallback instanceof FontUIResource ? (FontUIResource)fontWithFallback : new FontUIResource(fontWithFallback);
     }
 
     protected int getStringWidth(String text) {

src/main/resources/META-INF/plugin.xml

@@ -46,7 +46,8 @@
 
     <change-notes><![CDATA[
         <pre style="font-family: sans-serif">
-NEW: plugin logo icons added (Thx to FineVisuals for support)
+FIX: AssertionError: Already disposed Project #147
+FIX: No fallback font used in table editor #145
       </pre>
     ]]>
     </change-notes>