beenull/xpipe-mirror
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-11-22 15:40:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use system font by default

Browse source
This commit is contained in:
crschnick 2023-04-06 15:45:14 +00:00
parent 08032c96e5
commit 4726ad975c
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/io/xpipe/app/core/AppFont.java
View file

@ -61,13 +61,13 @@ public class AppFont {
public static void loadFonts() { public static void loadFonts() {
TrackEvent.info("Loading fonts ..."); TrackEvent.info("Loading fonts ...");
AppResources.with( AppResources.with(
"io.xpipe.app", AppResources.XPIPE_MODULE,
"fonts", "fonts",
path -> Files.walkFileTree(path, new SimpleFileVisitor<>() { path -> Files.walkFileTree(path, new SimpleFileVisitor<>() {
@Override @Override
public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
try (var in = Files.newInputStream(file)) { try (var in = Files.newInputStream(file)) {
Font.loadFont(in, 20); Font.loadFont(in, 12);
} }
return FileVisitResult.CONTINUE; return FileVisitResult.CONTINUE;
} }

4
app/src/main/java/io/xpipe/app/prefs/AppPrefs.java
View file

@ -46,8 +46,6 @@ public class AppPrefs {
private static final int tooltipDelayMin = 0; private static final int tooltipDelayMin = 0;
private static final int tooltipDelayMax = 1500; private static final int tooltipDelayMax = 1500;
private static final int fontSizeMin = 10;
private static final int fontSizeMax = 20;
private static final int editorReloadTimeoutMin = 0; private static final int editorReloadTimeoutMin = 0;
private static final int editorReloadTimeoutMax = 1500; private static final int editorReloadTimeoutMax = 1500;
private static final Path DEFAULT_STORAGE_DIR = private static final Path DEFAULT_STORAGE_DIR =
@ -89,7 +87,7 @@ public class AppPrefs {
public final ReadOnlyProperty<AppStyle.Theme> theme = themeInternal; public final ReadOnlyProperty<AppStyle.Theme> theme = themeInternal;
private final SingleSelectionField<AppStyle.Theme> themeControl = private final SingleSelectionField<AppStyle.Theme> themeControl =
Field.ofSingleSelectionType(themeList, themeInternal).render(() -> new TranslatableComboBoxControl<>()); Field.ofSingleSelectionType(themeList, themeInternal).render(() -> new TranslatableComboBoxControl<>());
private final BooleanProperty useSystemFontInternal = typed(new SimpleBooleanProperty(false), Boolean.class); private final BooleanProperty useSystemFontInternal = typed(new SimpleBooleanProperty(true), Boolean.class);
public final ReadOnlyBooleanProperty useSystemFont = useSystemFontInternal; public final ReadOnlyBooleanProperty useSystemFont = useSystemFontInternal;
private final IntegerProperty tooltipDelayInternal = typed(new SimpleIntegerProperty(1000), Integer.class); private final IntegerProperty tooltipDelayInternal = typed(new SimpleIntegerProperty(1000), Integer.class);