From f50582f35ce58c5b453b963de5b4e7b01c23e46e Mon Sep 17 00:00:00 2001 From: crschnick Date: Tue, 20 Jun 2023 12:10:21 +0000 Subject: [PATCH] Linux font fixes --- app/src/main/java/io/xpipe/app/core/AppFont.java | 6 ++++-- app/src/main/java/io/xpipe/app/prefs/AppPrefs.java | 3 --- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/io/xpipe/app/core/AppFont.java b/app/src/main/java/io/xpipe/app/core/AppFont.java index 3ebc901fe..dd9827955 100644 --- a/app/src/main/java/io/xpipe/app/core/AppFont.java +++ b/app/src/main/java/io/xpipe/app/core/AppFont.java @@ -2,6 +2,7 @@ package io.xpipe.app.core; import io.xpipe.app.issue.TrackEvent; import io.xpipe.app.prefs.AppPrefs; +import io.xpipe.core.process.OsType; import javafx.css.Size; import javafx.css.SizeUnits; import javafx.scene.Node; @@ -25,7 +26,7 @@ public class AppFont { } public static double getPixelSize(int off) { - var baseSize = AppPrefs.get() != null ? AppPrefs.get().fontSize.getValue() : 12; + var baseSize = OsType.getLocal() == OsType.LINUX ? 11 : 12; return new Size(baseSize + off, SizeUnits.PT).pixels(); } @@ -54,7 +55,8 @@ public class AppFont { return; } - var baseSize = AppPrefs.get() != null ? AppPrefs.get().fontSize.getValue() : 12; + // Somehow the font is bigger on Linux + var baseSize = OsType.getLocal() == OsType.LINUX ? 11 : 12; node.setStyle(node.getStyle() + "-fx-font-size: " + (baseSize + off) + "pt;"); } diff --git a/app/src/main/java/io/xpipe/app/prefs/AppPrefs.java b/app/src/main/java/io/xpipe/app/prefs/AppPrefs.java index f66469dce..863150576 100644 --- a/app/src/main/java/io/xpipe/app/prefs/AppPrefs.java +++ b/app/src/main/java/io/xpipe/app/prefs/AppPrefs.java @@ -98,9 +98,6 @@ public class AppPrefs { public final ReadOnlyBooleanProperty useSystemFont = useSystemFontInternal; private final IntegerProperty tooltipDelayInternal = typed(new SimpleIntegerProperty(1000), Integer.class); - private final IntegerProperty fontSizeInternal = typed(new SimpleIntegerProperty(12), Integer.class); - public final ReadOnlyIntegerProperty fontSize = fontSizeInternal; - private final BooleanProperty saveWindowLocationInternal = typed(new SimpleBooleanProperty(false), Boolean.class); public final ReadOnlyBooleanProperty saveWindowLocation = saveWindowLocationInternal;