From b5ad568f58f650d2be910debce3bb8f89fef6b22 Mon Sep 17 00:00:00 2001 From: crschnick Date: Wed, 9 Sep 2026 11:09:02 +0000 Subject: [PATCH] Various display fixes --- .../xpipe/app/comp/base/LoadingOverlayComp.java | 4 ++-- .../app/hub/entry/StoreEntryInformation.java | 2 -- .../xpipe/app/hub/entry/StoreEntryWrapper.java | 16 +++++----------- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/io/xpipe/app/comp/base/LoadingOverlayComp.java b/app/src/main/java/io/xpipe/app/comp/base/LoadingOverlayComp.java index 6237ec118..7cf06d2c4 100644 --- a/app/src/main/java/io/xpipe/app/comp/base/LoadingOverlayComp.java +++ b/app/src/main/java/io/xpipe/app/comp/base/LoadingOverlayComp.java @@ -40,8 +40,8 @@ public class LoadingOverlayComp extends RegionBuilder { loadingOverlay.getChildren().add(loading); } loadingOverlay.getStyleClass().add("loading-comp"); - loadingOverlay.setVisible(showIcon && this.loading.getValue()); - loadingOverlay.setManaged(showIcon && this.loading.getValue()); + loadingOverlay.setVisible(this.loading.getValue()); + loadingOverlay.setManaged(this.loading.getValue()); var listener = new ChangeListener() { @Override diff --git a/app/src/main/java/io/xpipe/app/hub/entry/StoreEntryInformation.java b/app/src/main/java/io/xpipe/app/hub/entry/StoreEntryInformation.java index f0e954bfb..f5e8d9997 100644 --- a/app/src/main/java/io/xpipe/app/hub/entry/StoreEntryInformation.java +++ b/app/src/main/java/io/xpipe/app/hub/entry/StoreEntryInformation.java @@ -54,8 +54,6 @@ public class StoreEntryInformation { if (s.getOsName() != null) { l.add(StoreEntryBadge.ofSystemName(s.getOsType(), s.getOsName())); - } else if (s instanceof ShellStoreState sss && sss.getRunning() != null && sss.getRunning()) { - // Don't add anything } else if (s.getShellDialect() == null && s.getOsName() == null) { l.add(StoreEntryBadge.ofUnknownSystemName().withCompressBehaviour(StoreEntryBadge.CompressBehaviour.HIDE)); } diff --git a/app/src/main/java/io/xpipe/app/hub/entry/StoreEntryWrapper.java b/app/src/main/java/io/xpipe/app/hub/entry/StoreEntryWrapper.java index 1252d6eb9..443f34d56 100644 --- a/app/src/main/java/io/xpipe/app/hub/entry/StoreEntryWrapper.java +++ b/app/src/main/java/io/xpipe/app/hub/entry/StoreEntryWrapper.java @@ -171,12 +171,6 @@ public class StoreEntryWrapper { shownName.setValue( AppPrefs.get().censorMode().get() ? "*".repeat(name.getValue().length()) : name.getValue()); - if (effectiveBusyProviderBound && !getValidity().getValue().isUsable()) { - this.effectiveBusyProviderBound = false; - this.effectiveBusy.unbind(); - this.effectiveBusy.bind(busy); - } - lastAccess.setValue(entry.getLastAccess()); disabled.setValue(entry.isDisabled()); validity.setValue(entry.getValidity()); @@ -342,16 +336,16 @@ public class StoreEntryWrapper { } } - if (!effectiveBusyProviderBound && getValidity().getValue().isUsable()) { + if (effectiveBusyProviderBound && !getValidity().getValue().isUsable()) { + this.effectiveBusyProviderBound = false; + this.effectiveBusy.unbind(); + this.effectiveBusy.bind(busy); + } else if (!effectiveBusyProviderBound && getValidity().getValue().isUsable()) { this.effectiveBusyProviderBound = true; this.effectiveBusy.unbind(); this.effectiveBusy.bind(busy.or(getEntry().getProvider().busy(this))); } - if (!this.effectiveBusy.isBound() && !getValidity().getValue().isUsable()) { - this.effectiveBusy.bind(busy); - } - // The property values are only registered as changed once they are queried // If we use information bindings that depend on some of these properties // but use the store methods to retrieve data instead of the wrapper properties,