From 0ed90ccbb6dedd4bb070a48bd2af4d27fada2b04 Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Sun, 2 Feb 2025 08:07:14 +0000
Subject: [PATCH] Fixes

---
 .../io/xpipe/app/browser/file/BrowserNavBarComp.java     | 3 ++-
 .../io/xpipe/app/comp/base/AppMainWindowContentComp.java | 2 +-
 .../main/java/io/xpipe/app/comp/base/DropdownComp.java   | 6 ++++--
 .../io/xpipe/app/comp/store/DenseStoreEntryComp.java     | 2 +-
 .../io/xpipe/app/comp/store/StandardStoreEntryComp.java  | 2 +-
 .../java/io/xpipe/app/comp/store/StoreEntryComp.java     | 9 +++++++--
 .../main/java/io/xpipe/app/util/ContextMenuHelper.java   | 7 ++++++-
 7 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/io/xpipe/app/browser/file/BrowserNavBarComp.java b/app/src/main/java/io/xpipe/app/browser/file/BrowserNavBarComp.java
index 13a34a747..9ddd6a99f 100644
--- a/app/src/main/java/io/xpipe/app/browser/file/BrowserNavBarComp.java
+++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserNavBarComp.java
@@ -9,6 +9,7 @@ import io.xpipe.app.comp.base.PrettyImageHelper;
 import io.xpipe.app.comp.base.TextFieldComp;
 import io.xpipe.app.comp.base.TooltipAugment;
 import io.xpipe.app.util.BooleanScope;
+import io.xpipe.app.util.ContextMenuHelper;
 import io.xpipe.app.util.ThreadHelper;
 
 import javafx.application.Platform;
@@ -172,7 +173,7 @@ public class BrowserNavBarComp extends Comp<BrowserNavBarComp.Structure> {
     }
 
     private ContextMenu createContextMenu() {
-        var cm = new ContextMenu();
+        var cm = ContextMenuHelper.create();
 
         var f = model.getHistory().getForwardHistory(8).stream().toList();
         for (int i = f.size() - 1; i >= 0; i--) {
diff --git a/app/src/main/java/io/xpipe/app/comp/base/AppMainWindowContentComp.java b/app/src/main/java/io/xpipe/app/comp/base/AppMainWindowContentComp.java
index e7576e050..8e68895ac 100644
--- a/app/src/main/java/io/xpipe/app/comp/base/AppMainWindowContentComp.java
+++ b/app/src/main/java/io/xpipe/app/comp/base/AppMainWindowContentComp.java
@@ -58,7 +58,7 @@ public class AppMainWindowContentComp extends SimpleComp {
             var version = new LabelComp((AppProperties.get().isStaging() ? "XPipe PTB" : "XPipe") + " "
                     + AppProperties.get().getVersion());
             version.apply(struc -> {
-                AppFontSizes.lg(struc.get());
+                AppFontSizes.xl(struc.get());
                 struc.get().setOpacity(0.6);
             });
 
diff --git a/app/src/main/java/io/xpipe/app/comp/base/DropdownComp.java b/app/src/main/java/io/xpipe/app/comp/base/DropdownComp.java
index c71710ee6..0028056b5 100644
--- a/app/src/main/java/io/xpipe/app/comp/base/DropdownComp.java
+++ b/app/src/main/java/io/xpipe/app/comp/base/DropdownComp.java
@@ -5,6 +5,7 @@ import io.xpipe.app.comp.CompStructure;
 import io.xpipe.app.comp.SimpleCompStructure;
 import io.xpipe.app.comp.augment.ContextMenuAugment;
 
+import io.xpipe.app.util.ContextMenuHelper;
 import javafx.beans.binding.Bindings;
 import javafx.beans.value.ObservableValue;
 import javafx.css.Size;
@@ -27,11 +28,12 @@ public class DropdownComp extends Comp<CompStructure<Button>> {
 
     @Override
     public CompStructure<Button> createBase() {
-        ContextMenu cm = new ContextMenu(items.stream()
+        var cm = ContextMenuHelper.create();
+        cm.getItems().setAll(items.stream()
                 .map(comp -> {
                     return new MenuItem(null, comp.createRegion());
                 })
-                .toArray(MenuItem[]::new));
+                .toList());
 
         Button button = (Button) new ButtonComp(null, () -> {})
                 .apply(new ContextMenuAugment<>(e -> true, null, () -> {
diff --git a/app/src/main/java/io/xpipe/app/comp/store/DenseStoreEntryComp.java b/app/src/main/java/io/xpipe/app/comp/store/DenseStoreEntryComp.java
index d50cb8c08..11ae66642 100644
--- a/app/src/main/java/io/xpipe/app/comp/store/DenseStoreEntryComp.java
+++ b/app/src/main/java/io/xpipe/app/comp/store/DenseStoreEntryComp.java
@@ -76,7 +76,7 @@ public class DenseStoreEntryComp extends StoreEntryComp {
 
         if (showIcon) {
             var storeIcon = createIcon(28, 24);
-            grid.getColumnConstraints().add(new ColumnConstraints(38));
+            grid.getColumnConstraints().add(new ColumnConstraints(34));
             grid.add(storeIcon, 0, 0);
             GridPane.setHalignment(storeIcon, HPos.CENTER);
         }
diff --git a/app/src/main/java/io/xpipe/app/comp/store/StandardStoreEntryComp.java b/app/src/main/java/io/xpipe/app/comp/store/StandardStoreEntryComp.java
index 5dc3d1a33..be08f8ece 100644
--- a/app/src/main/java/io/xpipe/app/comp/store/StandardStoreEntryComp.java
+++ b/app/src/main/java/io/xpipe/app/comp/store/StandardStoreEntryComp.java
@@ -41,7 +41,7 @@ public class StandardStoreEntryComp extends StoreEntryComp {
 
         var storeIcon = createIcon(46, 40);
         grid.add(storeIcon, 0, 0, 1, 2);
-        grid.getColumnConstraints().add(new ColumnConstraints(56));
+        grid.getColumnConstraints().add(new ColumnConstraints(52));
 
         var active = new StoreActiveComp(getWrapper()).createRegion();
         var nameBox = new HBox(name, userIcon, notes);
diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreEntryComp.java b/app/src/main/java/io/xpipe/app/comp/store/StoreEntryComp.java
index 91c32f22a..5110b9fa1 100644
--- a/app/src/main/java/io/xpipe/app/comp/store/StoreEntryComp.java
+++ b/app/src/main/java/io/xpipe/app/comp/store/StoreEntryComp.java
@@ -19,6 +19,7 @@ import io.xpipe.app.storage.DataStoreEntry;
 import io.xpipe.app.update.XPipeDistributionType;
 import io.xpipe.app.util.*;
 
+import io.xpipe.core.process.OsType;
 import javafx.beans.binding.Bindings;
 import javafx.beans.value.ObservableDoubleValue;
 import javafx.css.PseudoClass;
@@ -135,7 +136,11 @@ public abstract class StoreEntryComp extends SimpleComp {
 
         var loading = LoadingOverlayComp.noProgress(
                 Comp.of(() -> button), getWrapper().getEffectiveBusy());
-        AppFontSizes.base(button);
+        if (OsType.getLocal() == OsType.MACOS) {
+            AppFontSizes.sm(button);
+        } else {
+            AppFontSizes.base(button);
+        }
         return loading.createRegion();
     }
 
@@ -263,7 +268,7 @@ public abstract class StoreEntryComp extends SimpleComp {
     }
 
     protected ContextMenu createContextMenu() {
-        var contextMenu = new ContextMenu();
+        var contextMenu = ContextMenuHelper.create();
         AppFontSizes.sm(contextMenu.getStyleableNode());
 
         var hasSep = false;
diff --git a/app/src/main/java/io/xpipe/app/util/ContextMenuHelper.java b/app/src/main/java/io/xpipe/app/util/ContextMenuHelper.java
index 830b08814..9c95f0af7 100644
--- a/app/src/main/java/io/xpipe/app/util/ContextMenuHelper.java
+++ b/app/src/main/java/io/xpipe/app/util/ContextMenuHelper.java
@@ -3,6 +3,7 @@ package io.xpipe.app.util;
 import io.xpipe.app.core.AppFontSizes;
 import io.xpipe.app.core.AppI18n;
 
+import io.xpipe.core.process.OsType;
 import javafx.application.Platform;
 import javafx.geometry.Side;
 import javafx.scene.Node;
@@ -34,7 +35,11 @@ public class ContextMenuHelper {
                 }
             });
         });
-        AppFontSizes.sm(contextMenu.getStyleableNode());
+        if (OsType.getLocal() == OsType.MACOS) {
+            AppFontSizes.base(contextMenu.getStyleableNode());
+        } else {
+            AppFontSizes.sm(contextMenu.getStyleableNode());
+        }
         return contextMenu;
     }