From 346937a252e5875d4db8f6d8913dbd7cd792f94d Mon Sep 17 00:00:00 2001 From: crschnick Date: Wed, 11 Mar 2026 22:46:17 +0000 Subject: [PATCH] Rework --- .../app/hub/comp/StoreCreationDialog.java | 24 +++++++++++-------- .../app/hub/comp/StoreFilterFieldComp.java | 2 -- .../resources/style/modal-overlay-comp.css | 4 ++++ .../io/xpipe/app/resources/style/style.css | 9 +++++-- 4 files changed, 25 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/io/xpipe/app/hub/comp/StoreCreationDialog.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreCreationDialog.java index c693830b2..bf81c7462 100644 --- a/app/src/main/java/io/xpipe/app/hub/comp/StoreCreationDialog.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreCreationDialog.java @@ -161,7 +161,6 @@ public class StoreCreationDialog { comp.prefWidth(650); var nameKey = model.isQuickConnect() ? "quickConnect" : model.storeTypeNameKey() + "Add"; var modal = ModalOverlay.of(nameKey, comp); - var queueEntry = StoreCreationQueueEntry.of(model, modal); comp.apply(struc -> { struc.addEventHandler(KeyEvent.KEY_PRESSED, e -> { if (e.getCode() == KeyCode.ESCAPE) { @@ -173,16 +172,21 @@ public class StoreCreationDialog { } }); }); - modal.hideable(queueEntry); - AppLayoutModel.get().getSelected().addListener((observable, oldValue, newValue) -> { - if (model.getFinished().get() || !modal.isShowing()) { - return; - } - modal.hide(); - AppLayoutModel.get().getQueueEntries().add(queueEntry); - }); - modal.setRequireCloseButtonForClose(true); + if (!model.isQuickConnect()) { + var queueEntry = StoreCreationQueueEntry.of(model, modal); + modal.hideable(queueEntry); + AppLayoutModel.get().getSelected().addListener((observable, oldValue, newValue) -> { + if (model.getFinished().get() || !modal.isShowing()) { + return; + } + + modal.hide(); + AppLayoutModel.get().getQueueEntries().add(queueEntry); + }); + modal.setRequireCloseButtonForClose(true); + } + var loadingLabel = new LabelComp(Bindings.createStringBinding( () -> { return model.getBusy().get() ? AppI18n.get("testingConnection") : null; diff --git a/app/src/main/java/io/xpipe/app/hub/comp/StoreFilterFieldComp.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreFilterFieldComp.java index d34e12b0f..ad42e0781 100644 --- a/app/src/main/java/io/xpipe/app/hub/comp/StoreFilterFieldComp.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreFilterFieldComp.java @@ -51,8 +51,6 @@ public class StoreFilterFieldComp extends SimpleRegionBuilder { field.focusedProperty().subscribe(focus -> { if (focus) { popover.hide(); - } else { - state.open(); } }); diff --git a/app/src/main/resources/io/xpipe/app/resources/style/modal-overlay-comp.css b/app/src/main/resources/io/xpipe/app/resources/style/modal-overlay-comp.css index 95d71499e..d385a65c6 100644 --- a/app/src/main/resources/io/xpipe/app/resources/style/modal-overlay-comp.css +++ b/app/src/main/resources/io/xpipe/app/resources/style/modal-overlay-comp.css @@ -39,6 +39,10 @@ -fx-background-radius: 0 6 0 0; } +.root:seamless-frame:nord .modal-overlay-stack-element:loaded > .modal-overlay-comp.modal-pane > .scroll-pane > .viewport > * > .scrollable-content { + -fx-background-radius: 0; +} + .modal-overlay-stack-element > .modal-overlay-comp.modal-pane > .scroll-pane > .viewport > * > .scrollable-content { -color-modal-pane-overlay: transparent } diff --git a/app/src/main/resources/io/xpipe/app/resources/style/style.css b/app/src/main/resources/io/xpipe/app/resources/style/style.css index 235852c0b..765b49372 100644 --- a/app/src/main/resources/io/xpipe/app/resources/style/style.css +++ b/app/src/main/resources/io/xpipe/app/resources/style/style.css @@ -36,14 +36,19 @@ -fx-border-width: 1; -fx-border-radius: 4px; -fx-padding: 1px; - -fx-background-color: -color-bg-default-transparent; - -fx-border-color: -color-neutral-emphasis; + -fx-background-color: -color-bg-muted; + -fx-border-color: -color-border-default; } .scan-list .list-content { -fx-padding: 0.7em 1px 1em 1em; } +.root:nord .scan-list { + -fx-background-radius: 0; + -fx-border-radius: 0; +} + .root:windows .text { -fx-font-smoothing-type: gray; }