From ba9fe31b61dc327aec945b05e2a878ca30c24ae2 Mon Sep 17 00:00:00 2001 From: crschnick Date: Sun, 2 Feb 2025 12:00:11 +0000 Subject: [PATCH] Style fixes --- .../io/xpipe/app/browser/file/BrowserContextMenu.java | 2 ++ .../browser/file/BrowserQuickAccessContextMenu.java | 2 ++ .../java/io/xpipe/app/comp/store/StoreEntryComp.java | 10 +++++++++- .../io/xpipe/app/resources/style/store-entry-comp.css | 2 +- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/io/xpipe/app/browser/file/BrowserContextMenu.java b/app/src/main/java/io/xpipe/app/browser/file/BrowserContextMenu.java index c651b3565..cf47fee90 100644 --- a/app/src/main/java/io/xpipe/app/browser/file/BrowserContextMenu.java +++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserContextMenu.java @@ -25,6 +25,8 @@ public final class BrowserContextMenu extends ContextMenu { } private void createMenu() { + AppFontSizes.lg(getStyleableNode()); + InputHelper.onLeft(this, false, e -> { hide(); e.consume(); diff --git a/app/src/main/java/io/xpipe/app/browser/file/BrowserQuickAccessContextMenu.java b/app/src/main/java/io/xpipe/app/browser/file/BrowserQuickAccessContextMenu.java index c20f95d56..b77032b32 100644 --- a/app/src/main/java/io/xpipe/app/browser/file/BrowserQuickAccessContextMenu.java +++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserQuickAccessContextMenu.java @@ -2,6 +2,7 @@ package io.xpipe.app.browser.file; import io.xpipe.app.browser.icon.BrowserIconManager; import io.xpipe.app.comp.base.PrettyImageHelper; +import io.xpipe.app.core.AppFontSizes; import io.xpipe.app.util.BooleanAnimationTimer; import io.xpipe.app.util.InputHelper; import io.xpipe.app.util.ThreadHelper; @@ -41,6 +42,7 @@ public class BrowserQuickAccessContextMenu extends ContextMenu { this.base = base; this.model = model; + AppFontSizes.lg(getStyleableNode()); addEventFilter(Menu.ON_SHOWING, e -> { Node content = getSkin().getNode(); if (content instanceof Region r) { 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 55f936949..c11336edd 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 @@ -138,8 +138,16 @@ public abstract class StoreEntryComp extends SimpleComp { Comp.of(() -> button), getWrapper().getEffectiveBusy()); if (OsType.getLocal() == OsType.MACOS) { AppFontSizes.base(button); - } else { + } else if (OsType.getLocal() == OsType.LINUX) { AppFontSizes.xl(button); + } else { + AppFontSizes.apply(button, sizes -> { + if (sizes.getBase().equals("10.5")) { + return sizes.getXl(); + } else { + return sizes.getLg(); + } + }); } return loading.createRegion(); } diff --git a/app/src/main/resources/io/xpipe/app/resources/style/store-entry-comp.css b/app/src/main/resources/io/xpipe/app/resources/style/store-entry-comp.css index 207b9c582..442922075 100644 --- a/app/src/main/resources/io/xpipe/app/resources/style/store-entry-comp.css +++ b/app/src/main/resources/io/xpipe/app/resources/style/store-entry-comp.css @@ -8,7 +8,7 @@ } .store-list-comp.scroll-pane { - -fx-padding: 0 0 0 1; + -fx-padding: 0 0 0 2; } .store-list-comp.scroll-pane .scroll-bar:vertical {