From 5cda797d5a47d427234286ec81e80efe45d38a0c Mon Sep 17 00:00:00 2001 From: crschnick Date: Thu, 15 Aug 2024 09:36:16 +0000 Subject: [PATCH] Bold macos fixes --- .../java/io/xpipe/app/browser/BrowserGreetingComp.java | 5 ++++- .../java/io/xpipe/app/comp/store/StoreIntroComp.java | 9 +++++++-- app/src/main/java/io/xpipe/app/prefs/AboutCategory.java | 8 ++++++-- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/io/xpipe/app/browser/BrowserGreetingComp.java b/app/src/main/java/io/xpipe/app/browser/BrowserGreetingComp.java index 3ba8ba5d8..3483c988f 100644 --- a/app/src/main/java/io/xpipe/app/browser/BrowserGreetingComp.java +++ b/app/src/main/java/io/xpipe/app/browser/BrowserGreetingComp.java @@ -6,6 +6,7 @@ import io.xpipe.app.core.AppLayoutModel; import io.xpipe.app.fxcomps.SimpleComp; import io.xpipe.app.fxcomps.util.PlatformThread; +import io.xpipe.core.process.OsType; import javafx.scene.control.Label; import javafx.scene.layout.Region; @@ -24,7 +25,9 @@ public class BrowserGreetingComp extends SimpleComp { }); }); AppFont.setSize(r, 7); - r.getStyleClass().add(Styles.TEXT_BOLD); + if (OsType.getLocal() != OsType.MACOS) { + r.getStyleClass().add(Styles.TEXT_BOLD); + } return r; } diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreIntroComp.java b/app/src/main/java/io/xpipe/app/comp/store/StoreIntroComp.java index 53c10156e..b84bf8161 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreIntroComp.java +++ b/app/src/main/java/io/xpipe/app/comp/store/StoreIntroComp.java @@ -8,6 +8,7 @@ import io.xpipe.app.prefs.AppPrefs; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.util.ScanAlert; +import io.xpipe.core.process.OsType; import javafx.beans.property.SimpleStringProperty; import javafx.geometry.Insets; import javafx.geometry.Pos; @@ -26,7 +27,9 @@ public class StoreIntroComp extends SimpleComp { private Region createIntro() { var title = new Label(); title.textProperty().bind(AppI18n.observable("storeIntroTitle")); - title.getStyleClass().add(Styles.TEXT_BOLD); + if (OsType.getLocal() != OsType.MACOS) { + title.getStyleClass().add(Styles.TEXT_BOLD); + } AppFont.setSize(title, 7); var introDesc = new Label(); @@ -63,7 +66,9 @@ public class StoreIntroComp extends SimpleComp { private Region createImportIntro() { var title = new Label(); title.textProperty().bind(AppI18n.observable("importConnectionsTitle")); - title.getStyleClass().add(Styles.TEXT_BOLD); + if (OsType.getLocal() != OsType.MACOS) { + title.getStyleClass().add(Styles.TEXT_BOLD); + } AppFont.setSize(title, 7); var importDesc = new Label(); diff --git a/app/src/main/java/io/xpipe/app/prefs/AboutCategory.java b/app/src/main/java/io/xpipe/app/prefs/AboutCategory.java index fe4c6f112..6525eba94 100644 --- a/app/src/main/java/io/xpipe/app/prefs/AboutCategory.java +++ b/app/src/main/java/io/xpipe/app/prefs/AboutCategory.java @@ -11,6 +11,7 @@ import io.xpipe.app.util.Hyperlinks; import io.xpipe.app.util.JfxHelper; import io.xpipe.app.util.OptionsBuilder; +import io.xpipe.core.process.OsType; import javafx.beans.property.SimpleStringProperty; import javafx.geometry.Insets; import javafx.scene.control.ScrollPane; @@ -116,8 +117,11 @@ public class AboutCategory extends AppPrefsCategory { "Version " + AppProperties.get().getVersion() + " (" + AppProperties.get().getArch() + ")"), "logo.png"); - }) - .styleClass(Styles.TEXT_BOLD); + }); + + if (OsType.getLocal() != OsType.MACOS) { + title.styleClass(Styles.TEXT_BOLD); + } var section = new OptionsBuilder() .addComp(title, null)