Merge pull request #5330 from calixtus/remove_javafx_fontfix

Remove JavaFX-Font-Tweak
JabRef · Oct 14, 2019 · 824b103 · 824b103
2 parents 8bd6821 + 44d3978
commit 824b103
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 23 deletions.
diff --git a/src/main/java/org/jabref/JabRefGUI.java b/src/main/java/org/jabref/JabRefGUI.java
@@ -55,8 +55,6 @@ public JabRefGUI(Stage mainStage, List<ParserResult> databases, boolean isBlank)
     }
 
     private void openWindow(Stage mainStage) {
-        applyFontRenderingTweak();
-
         GUIGlobals.init();
 
         LOGGER.debug("Initializing frame");
@@ -230,15 +228,6 @@ private boolean isLoaded(File fileToOpen) {
         return false;
     }
 
-    private void applyFontRenderingTweak() {
-        // On Linux, Java FX fonts look blurry per default. This can be improved by using a non-default rendering setting.
-        // See https://github.com/woky/javafx-hates-linux
-        if (Globals.prefs.getBoolean(JabRefPreferences.FX_FONT_RENDERING_TWEAK)) {
-            System.setProperty("prism.text", "t2k");
-            System.setProperty("prism.lcdtext", "true");
-        }
-    }
-
     public static JabRefFrame getMainFrame() {
         return mainFrame;
     }

diff --git a/src/main/java/org/jabref/gui/preferences/AppearancePrefsTab.java b/src/main/java/org/jabref/gui/preferences/AppearancePrefsTab.java
@@ -24,7 +24,6 @@
 class AppearancePrefsTab extends Pane implements PreferencesTab {
 
     private final JabRefPreferences prefs;
-    private final CheckBox fontTweaksLAF;
     private final TextField fontSize;
     private final CheckBox overrideFonts;
     private final DialogService dialogService;
@@ -46,7 +45,6 @@ public AppearancePrefsTab(DialogService dialogService, JabRefPreferences prefs)
         fontSize = new TextField();
         fontSize.setTextFormatter(ControlHelper.getIntegerTextFormatter());
         Label fontSizeLabel = new Label(Localization.lang("Font size:"));
-        fontTweaksLAF = new CheckBox(Localization.lang("Tweak font rendering for entry editor on Linux"));
 
         ToggleGroup themeGroup = new ToggleGroup();
         lightTheme = new RadioButton("Light theme");
@@ -83,17 +81,12 @@ public Node getBuilder() {
 
     @Override
     public void setValues() {
-        fontTweaksLAF.setSelected(prefs.getBoolean(JabRefPreferences.FX_FONT_RENDERING_TWEAK));
         overrideFonts.setSelected(prefs.getBoolean(JabRefPreferences.OVERRIDE_DEFAULT_FONT_SIZE));
         fontSize.setText(String.valueOf(prefs.getInt(JabRefPreferences.MAIN_FONT_SIZE)));
     }
 
     @Override
     public void storeSettings() {
-        // Java FX font rendering tweak
-        final boolean oldFxTweakValue = prefs.getBoolean(JabRefPreferences.FX_FONT_RENDERING_TWEAK);
-        prefs.putBoolean(JabRefPreferences.FX_FONT_RENDERING_TWEAK, fontTweaksLAF.isSelected());
-
         final boolean oldOverrideDefaultFontSize = prefs.getBoolean(JabRefPreferences.OVERRIDE_DEFAULT_FONT_SIZE);
         final int oldFontSize = prefs.getInt(JabRefPreferences.MAIN_FONT_SIZE);
         prefs.putBoolean(JabRefPreferences.OVERRIDE_DEFAULT_FONT_SIZE, overrideFonts.isSelected());
@@ -111,8 +104,7 @@ public void storeSettings() {
         }
 
         boolean isRestartRequired =
-                (oldFxTweakValue != fontTweaksLAF.isSelected())
-                        || (oldOverrideDefaultFontSize != overrideFonts.isSelected())
+                (oldOverrideDefaultFontSize != overrideFonts.isSelected())
                         || (oldFontSize != newFontSize)
                         || isThemeChanged;
         if (isRestartRequired) {

diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -127,7 +127,6 @@ public class JabRefPreferences implements PreferencesService {
     public static final String LYXPIPE = "lyxpipe";
     public static final String EXTERNAL_FILE_TYPES = "externalFileTypes";
     public static final String FONT_FAMILY = "fontFamily";
-    public static final String FX_FONT_RENDERING_TWEAK = "fxFontRenderingTweak";
     public static final String FX_THEME = "fxTheme";
     public static final String LANGUAGE = "language";
     public static final String NAMES_LAST_ONLY = "namesLastOnly";
@@ -471,7 +470,6 @@ private JabRefPreferences() {
             defaults.put(EMACS_PATH, "emacsclient");
         }
 
-        defaults.put(FX_FONT_RENDERING_TWEAK, OS.LINUX); //we turn this on per default on Linux
         defaults.put(EMACS_ADDITIONAL_PARAMETERS, "-n -e");
 
         defaults.put(PUSH_TO_APPLICATION, "TeXstudio");

diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
@@ -954,7 +954,6 @@ Upgrade\ external\ PDF/PS\ links\ to\ use\ the\ '%0'\ field.=Upgrade external PD
 usage=usage
 Use\ autocompletion=Use autocompletion
 
-Tweak\ font\ rendering\ for\ entry\ editor\ on\ Linux=Tweak font rendering for entry editor on Linux
 Use\ regular\ expression\ search=Use regular expression search
 
 Username=Username