From c475353c22cc65e9b75427177e0ec2261b6f55f3 Mon Sep 17 00:00:00 2001 From: crschnick Date: Wed, 27 Mar 2024 17:36:27 +0000 Subject: [PATCH] Small browser fixes --- .../browser/BrowserQuickAccessButtonComp.java | 5 +- .../io/xpipe/app/resources/style/bookmark.css | 4 ++ .../io/xpipe/app/resources/style/browser.css | 65 ++----------------- 3 files changed, 14 insertions(+), 60 deletions(-) diff --git a/app/src/main/java/io/xpipe/app/browser/BrowserQuickAccessButtonComp.java b/app/src/main/java/io/xpipe/app/browser/BrowserQuickAccessButtonComp.java index b7fecf2f..1df93da5 100644 --- a/app/src/main/java/io/xpipe/app/browser/BrowserQuickAccessButtonComp.java +++ b/app/src/main/java/io/xpipe/app/browser/BrowserQuickAccessButtonComp.java @@ -43,6 +43,7 @@ public class BrowserQuickAccessButtonComp extends SimpleComp { event.consume(); }); }); + button.styleClass("quick-access-button"); return button.createRegion(); } @@ -52,7 +53,6 @@ public class BrowserQuickAccessButtonComp extends SimpleComp { Node content = cm.getSkin().getNode(); if (content instanceof Region r) { r.setMaxWidth(500); - r.setMaxHeight(600); } }); cm.setAutoHide(true); @@ -94,6 +94,7 @@ public class BrowserQuickAccessButtonComp extends SimpleComp { browserCm.show(m.getStyleableNode(), Side.RIGHT, 0, 0); showingActionsMenu.set(browserCm); }); + m.getStyleClass().add("leaf"); return m; } @@ -168,6 +169,8 @@ public class BrowserQuickAccessButtonComp extends SimpleComp { var newFiles = model.getFileSystem().listFiles(fileEntry.getPath()); try (var s = newFiles) { var list = s.toList(); + // Wait until all files are listed, i.e. do not skip the stream elements + list = list.subList(0, Math.min(list.size(), 150)); var newItems = new ArrayList(); if (list.isEmpty()) { diff --git a/app/src/main/resources/io/xpipe/app/resources/style/bookmark.css b/app/src/main/resources/io/xpipe/app/resources/style/bookmark.css index b4b6c5c0..bec47fc7 100644 --- a/app/src/main/resources/io/xpipe/app/resources/style/bookmark.css +++ b/app/src/main/resources/io/xpipe/app/resources/style/bookmark.css @@ -17,3 +17,7 @@ .bookmark-list .store-section-mini-comp .item:selected { -fx-font-weight: BOLD; } + +.bookmark-list .store-section-mini-comp .item { + -fx-padding: 0.1em 0.4em 0.1em 0.4em; +} 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 335ff98e..16bbb034 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 @@ -53,69 +53,10 @@ -fx-border-radius: 1px; } -.bookmark-list .tree-cell:filled:hover { - -fx-background-color: -color-accent-muted; -} - *:drag-over .download-background { -fx-background-color: -color-success-muted; } -.bookmark-list .tree-cell:drag-over { - -fx-background-color: -color-success-muted; -} - -.bookmark-list .tree-cell:disabled { - -fx-opacity: 0.5; -} - -.bookmark-list .tree-cell { - -fx-background-radius: 5px; - -fx-padding: 8px 8px 8px 3px; - -fx-background-insets: 5px 5px 5px 5px; -} - -.bookmark-list .tree-cell.first { - -fx-padding: 12px 8px 8px 3px; - -fx-background-insets: 9px 5px 5px 5px; -} - -.bookmark-list .combo-box { - -fx-padding: 0px; -} - -.bookmark-list .item { - -fx-border-width: 0; - -fx-background-radius: 0; - -fx-background-insets: 0; - -fx-background-color: transparent; -} - -.bookmark-list .item:selected { - -fx-padding: 5px; -} - -.browser .bookmark-tree { - -fx-border-width: 0; - -fx-padding: 5px; - -fx-spacing: 5px; -} - -.browser .bookmark-list *.scroll-bar:horizontal, -.browser .bookmark-list *.scroll-bar:horizontal *.track, -.browser .bookmark-list *.scroll-bar:horizontal *.track-background, -.browser .bookmark-list *.scroll-bar:horizontal *.thumb, -.browser .bookmark-list *.scroll-bar:horizontal *.increment-button, -.browser .bookmark-list *.scroll-bar:horizontal *.decrement-button, -.browser .bookmark-list *.scroll-bar:horizontal *.increment-arrow, -.browser .bookmark-list *.scroll-bar:horizontal *.decrement-arrow { - -fx-background-color: null; - -fx-background-radius: 0; - -fx-background-insets: 0; - -fx-padding: 0; - -fx-shape: null; -} - .browser .top-bar { -fx-border-width: 1 0 1 0; -fx-border-color: -color-border-default; @@ -266,3 +207,9 @@ .browser .tab:selected { -fx-opacity: 1.0; } + + +.browser .quick-access-button .context-menu .leaf .arrow { + -fx-opacity: 0; +} +