From 5f6a9e6debfc8423b1663ec60dff4e40a9b84928 Mon Sep 17 00:00:00 2001 From: crschnick Date: Mon, 6 Nov 2023 20:05:04 +0000 Subject: [PATCH] Browser fixes --- .../app/browser/BrowserFileListModel.java | 3 --- .../xpipe/app/browser/BrowserTransferComp.java | 6 +++--- .../io/xpipe/app/resources/style/browser.css | 18 ++++++++++++++++-- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/io/xpipe/app/browser/BrowserFileListModel.java b/app/src/main/java/io/xpipe/app/browser/BrowserFileListModel.java index f82d27414..30a7bd3b8 100644 --- a/app/src/main/java/io/xpipe/app/browser/BrowserFileListModel.java +++ b/app/src/main/java/io/xpipe/app/browser/BrowserFileListModel.java @@ -88,9 +88,6 @@ public final class BrowserFileListModel { .toList() : all.getValue(); - Comparator tableComparator = comparatorProperty.getValue(); - var comparator = - tableComparator != null ? FILE_TYPE_COMPARATOR.thenComparing(tableComparator) : FILE_TYPE_COMPARATOR; var listCopy = new ArrayList<>(filtered); sort(listCopy); shown.setValue(listCopy); diff --git a/app/src/main/java/io/xpipe/app/browser/BrowserTransferComp.java b/app/src/main/java/io/xpipe/app/browser/BrowserTransferComp.java index cf12eaae7..8ad2b8285 100644 --- a/app/src/main/java/io/xpipe/app/browser/BrowserTransferComp.java +++ b/app/src/main/java/io/xpipe/app/browser/BrowserTransferComp.java @@ -73,8 +73,8 @@ public class BrowserTransferComp extends SimpleComp { .apply(struc -> struc.get().setSpacing(10)), button -> { var p = new AnchorPane(button); - AnchorPane.setRightAnchor(button, 20.0); - AnchorPane.setTopAnchor(button, 20.0); + AnchorPane.setRightAnchor(button, 10.0); + AnchorPane.setTopAnchor(button, 10.0); p.setPickOnBounds(false); return p; }); @@ -155,6 +155,6 @@ public class BrowserTransferComp extends SimpleComp { }); }), PlatformThread.sync(stage.getDownloading())); - return stack.createRegion(); + return stack.styleClass("transfer").createRegion(); } } diff --git a/app/src/main/resources/io/xpipe/app/resources/style/browser.css b/app/src/main/resources/io/xpipe/app/resources/style/browser.css index fabbbd361..a2c50e431 100644 --- a/app/src/main/resources/io/xpipe/app/resources/style/browser.css +++ b/app/src/main/resources/io/xpipe/app/resources/style/browser.css @@ -1,7 +1,21 @@ .download-background { + -fx-border-color: -color-border-default; + -fx-border-width: 1px 0 0 0; + -fx-padding: 1em; +} + +.transfer .button { -fx-border-color: -color-border-default; --fx-border-width: 1px 0 0 0; --fx-padding: 1em; +-fx-border-width: 1px; + -fx-background-color: -color-bg-default; + -fx-background-radius: 4; + -fx-border-radius: 4; + -fx-padding: 0.1em 0.2em; +} + +.transfer .button:hover { + -fx-background-color: -color-bg-subtle; + -fx-opacity: 1.0; } .browser .welcome .button {