[INTERNAL] remove introduced advanced font setting (always apply)

Author: SeeSharpSoft

src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/CsvEditorSettingsExternalizable.java

@@ -50,7 +50,6 @@ public static final class OptionSet {
         public boolean SHOW_TABLE_EDITOR_INFO_PANEL;
         public boolean QUOTING_ENFORCED;
         public boolean FILE_END_LINE_BREAK;
-        public boolean ADVANCED_FONT_HANDLING;
 
         public OptionSet() {
             EditorSettingsExternalizable editorSettingsExternalizable = EditorSettingsExternalizable.getInstance();
@@ -70,7 +69,6 @@ public OptionSet() {
             TABLE_COLUMN_HIGHTLIGHTING = true;
             ZERO_BASED_COLUMN_NUMBERING = false;
             FILE_END_LINE_BREAK = true;
-            ADVANCED_FONT_HANDLING = true;
         }
     }
 
@@ -239,12 +237,4 @@ public boolean isTableAutoColumnWidthOnOpen() {
     public void setTableAutoColumnWidthOnOpen(boolean tableAutoColumnWidthOnOpen) {
         getState().TABLE_AUTO_COLUMN_WIDTH_ON_OPEN = tableAutoColumnWidthOnOpen;
     }
-
-    public boolean isAdvancedFontHandling() {
-        return getState().ADVANCED_FONT_HANDLING;
-    }
-
-    public void setAdvancedFontHandling(boolean advancedFontHandling) {
-        getState().ADVANCED_FONT_HANDLING = advancedFontHandling;
-    }
 }

src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/CsvEditorSettingsProvider.form

@@ -86,7 +86,7 @@
           </grid>
         </children>
       </grid>
-      <grid id="3e325" layout-manager="GridLayoutManager" row-count="9" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+      <grid id="3e325" layout-manager="GridLayoutManager" row-count="8" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="10" left="10" bottom="10" right="10"/>
         <constraints>
           <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
@@ -112,7 +112,7 @@
           </component>
           <component id="f25dc" class="javax.swing.JCheckBox" binding="cbTableColumnHighlighting">
             <constraints>
-              <grid row="8" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+              <grid row="7" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <text value="Enable column highlighting (Editor &gt; Color Scheme &gt; CSV &gt; Column Hightlighting Colors)"/>
@@ -134,14 +134,6 @@
               <text value="Adjust column width on open (default)"/>
             </properties>
           </component>
-          <component id="67b12" class="javax.swing.JCheckBox" binding="cbAdvancedFontHandling">
-            <constraints>
-              <grid row="7" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text value="Advanced font handling (might impact performance)"/>
-            </properties>
-          </component>
           <grid id="8ebb6" layout-manager="GridLayoutManager" row-count="1" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
             <margin top="0" left="0" bottom="0" right="0"/>
             <constraints>

src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/CsvEditorSettingsProvider.java

@@ -35,7 +35,6 @@ public class CsvEditorSettingsProvider implements SearchableConfigurable {
     private JFormattedTextField tfMaxColumnWidth;
     private JFormattedTextField tfDefaultColumnWidth;
     private JCheckBox cbAdjustColumnWidthOnOpen;
-    private JCheckBox cbAdvancedFontHandling;
 
     @NotNull
     @Override
@@ -83,8 +82,7 @@ public boolean isModified() {
                 isModified(cbFileEndLineBreak, csvEditorSettingsExternalizable.isFileEndLineBreak()) ||
                 !tfMaxColumnWidth.getValue().equals(csvEditorSettingsExternalizable.getTableAutoMaxColumnWidth()) ||
                 !tfDefaultColumnWidth.getValue().equals(csvEditorSettingsExternalizable.getTableDefaultColumnWidth()) ||
-                isModified(cbAdjustColumnWidthOnOpen, csvEditorSettingsExternalizable.isTableAutoColumnWidthOnOpen()) ||
-                isModified(cbAdvancedFontHandling, csvEditorSettingsExternalizable.isAdvancedFontHandling());
+                isModified(cbAdjustColumnWidthOnOpen, csvEditorSettingsExternalizable.isTableAutoColumnWidthOnOpen());
     }
 
     @Override
@@ -106,7 +104,6 @@ public void reset() {
         tfMaxColumnWidth.setValue(csvEditorSettingsExternalizable.getTableAutoMaxColumnWidth());
         tfDefaultColumnWidth.setValue(csvEditorSettingsExternalizable.getTableDefaultColumnWidth());
         cbAdjustColumnWidthOnOpen.setSelected(csvEditorSettingsExternalizable.isTableAutoColumnWidthOnOpen());
-        cbAdvancedFontHandling.setSelected(csvEditorSettingsExternalizable.isAdvancedFontHandling());
     }
 
     @Override
@@ -128,7 +125,6 @@ public void apply() throws ConfigurationException {
         csvEditorSettingsExternalizable.setTableAutoMaxColumnWidth((int) tfMaxColumnWidth.getValue());
         csvEditorSettingsExternalizable.setTableDefaultColumnWidth((int) tfDefaultColumnWidth.getValue());
         csvEditorSettingsExternalizable.setTableAutoColumnWidthOnOpen(cbAdjustColumnWidthOnOpen.isSelected());
-        csvEditorSettingsExternalizable.setAdvancedFontHandling(cbAdvancedFontHandling.isSelected());
     }
 
     protected void createUIComponents() {

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

@@ -129,17 +129,15 @@ protected void setText(@NotNull String text) {
     protected Font determineFont(@NotNull String text) {
         Font finalFont = UIUtil.getFontWithFallback(EditorColorsManager.getInstance().getGlobalScheme().getFont(EditorFontType.PLAIN));
 
-        if (CsvEditorSettingsExternalizable.getInstance().isAdvancedFontHandling()) {
-            FontFallbackIterator it = new FontFallbackIterator();
-            it.setPreferredFont(finalFont.getFamily(), finalFont.getSize());
-            it.setFontStyle(finalFont.getStyle());
-            it.start(text, 0, text.length());
-            for (; !it.atEnd(); it.advance()) {
-                Font font = it.getFont();
-                if (!font.getFamily().equals(finalFont.getFamily())) {
-                    finalFont = font;
-                    break;
-                }
+        FontFallbackIterator it = new FontFallbackIterator();
+        it.setPreferredFont(finalFont.getFamily(), finalFont.getSize());
+        it.setFontStyle(finalFont.getStyle());
+        it.start(text, 0, text.length());
+        for (; !it.atEnd(); it.advance()) {
+            Font font = it.getFont();
+            if (!font.getFamily().equals(finalFont.getFamily())) {
+                finalFont = font;
+                break;
             }
         }