Skip to content

Commit 824b103

Browse files
authored
Merge pull request #5330 from calixtus/remove_javafx_fontfix
Remove JavaFX-Font-Tweak
2 parents 8bd6821 + 44d3978 commit 824b103

File tree

4 files changed

+1
-23
lines changed

4 files changed

+1
-23
lines changed

src/main/java/org/jabref/JabRefGUI.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ public JabRefGUI(Stage mainStage, List<ParserResult> databases, boolean isBlank)
5555
}
5656

5757
private void openWindow(Stage mainStage) {
58-
applyFontRenderingTweak();
59-
6058
GUIGlobals.init();
6159

6260
LOGGER.debug("Initializing frame");
@@ -230,15 +228,6 @@ private boolean isLoaded(File fileToOpen) {
230228
return false;
231229
}
232230

233-
private void applyFontRenderingTweak() {
234-
// On Linux, Java FX fonts look blurry per default. This can be improved by using a non-default rendering setting.
235-
// See https://github.com/woky/javafx-hates-linux
236-
if (Globals.prefs.getBoolean(JabRefPreferences.FX_FONT_RENDERING_TWEAK)) {
237-
System.setProperty("prism.text", "t2k");
238-
System.setProperty("prism.lcdtext", "true");
239-
}
240-
}
241-
242231
public static JabRefFrame getMainFrame() {
243232
return mainFrame;
244233
}

src/main/java/org/jabref/gui/preferences/AppearancePrefsTab.java

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
class AppearancePrefsTab extends Pane implements PreferencesTab {
2525

2626
private final JabRefPreferences prefs;
27-
private final CheckBox fontTweaksLAF;
2827
private final TextField fontSize;
2928
private final CheckBox overrideFonts;
3029
private final DialogService dialogService;
@@ -46,7 +45,6 @@ public AppearancePrefsTab(DialogService dialogService, JabRefPreferences prefs)
4645
fontSize = new TextField();
4746
fontSize.setTextFormatter(ControlHelper.getIntegerTextFormatter());
4847
Label fontSizeLabel = new Label(Localization.lang("Font size:"));
49-
fontTweaksLAF = new CheckBox(Localization.lang("Tweak font rendering for entry editor on Linux"));
5048

5149
ToggleGroup themeGroup = new ToggleGroup();
5250
lightTheme = new RadioButton("Light theme");
@@ -83,17 +81,12 @@ public Node getBuilder() {
8381

8482
@Override
8583
public void setValues() {
86-
fontTweaksLAF.setSelected(prefs.getBoolean(JabRefPreferences.FX_FONT_RENDERING_TWEAK));
8784
overrideFonts.setSelected(prefs.getBoolean(JabRefPreferences.OVERRIDE_DEFAULT_FONT_SIZE));
8885
fontSize.setText(String.valueOf(prefs.getInt(JabRefPreferences.MAIN_FONT_SIZE)));
8986
}
9087

9188
@Override
9289
public void storeSettings() {
93-
// Java FX font rendering tweak
94-
final boolean oldFxTweakValue = prefs.getBoolean(JabRefPreferences.FX_FONT_RENDERING_TWEAK);
95-
prefs.putBoolean(JabRefPreferences.FX_FONT_RENDERING_TWEAK, fontTweaksLAF.isSelected());
96-
9790
final boolean oldOverrideDefaultFontSize = prefs.getBoolean(JabRefPreferences.OVERRIDE_DEFAULT_FONT_SIZE);
9891
final int oldFontSize = prefs.getInt(JabRefPreferences.MAIN_FONT_SIZE);
9992
prefs.putBoolean(JabRefPreferences.OVERRIDE_DEFAULT_FONT_SIZE, overrideFonts.isSelected());
@@ -111,8 +104,7 @@ public void storeSettings() {
111104
}
112105

113106
boolean isRestartRequired =
114-
(oldFxTweakValue != fontTweaksLAF.isSelected())
115-
|| (oldOverrideDefaultFontSize != overrideFonts.isSelected())
107+
(oldOverrideDefaultFontSize != overrideFonts.isSelected())
116108
|| (oldFontSize != newFontSize)
117109
|| isThemeChanged;
118110
if (isRestartRequired) {

src/main/java/org/jabref/preferences/JabRefPreferences.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@ public class JabRefPreferences implements PreferencesService {
127127
public static final String LYXPIPE = "lyxpipe";
128128
public static final String EXTERNAL_FILE_TYPES = "externalFileTypes";
129129
public static final String FONT_FAMILY = "fontFamily";
130-
public static final String FX_FONT_RENDERING_TWEAK = "fxFontRenderingTweak";
131130
public static final String FX_THEME = "fxTheme";
132131
public static final String LANGUAGE = "language";
133132
public static final String NAMES_LAST_ONLY = "namesLastOnly";
@@ -471,7 +470,6 @@ private JabRefPreferences() {
471470
defaults.put(EMACS_PATH, "emacsclient");
472471
}
473472

474-
defaults.put(FX_FONT_RENDERING_TWEAK, OS.LINUX); //we turn this on per default on Linux
475473
defaults.put(EMACS_ADDITIONAL_PARAMETERS, "-n -e");
476474

477475
defaults.put(PUSH_TO_APPLICATION, "TeXstudio");

src/main/resources/l10n/JabRef_en.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -954,7 +954,6 @@ Upgrade\ external\ PDF/PS\ links\ to\ use\ the\ '%0'\ field.=Upgrade external PD
954954
usage=usage
955955
Use\ autocompletion=Use autocompletion
956956

957-
Tweak\ font\ rendering\ for\ entry\ editor\ on\ Linux=Tweak font rendering for entry editor on Linux
958957
Use\ regular\ expression\ search=Use regular expression search
959958

960959
Username=Username

0 commit comments

Comments
 (0)