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 9f4490229..b732b640d 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 @@ -245,7 +245,10 @@ public abstract class StoreEntryComp extends SimpleComp { button.apply(new ContextMenuAugment<>( mouseEvent -> mouseEvent.getButton() == MouseButton.PRIMARY, keyEvent -> false, () -> { var cm = ContextMenuHelper.create(); - branch.getChildren(getWrapper().getEntry().ref()).forEach(childProvider -> { + branch.getChildren(getWrapper().getEntry().ref()) + .stream() + .filter(actionProvider -> getWrapper().showActionProvider(actionProvider)) + .forEach(childProvider -> { var menu = buildMenuItemForAction(childProvider); if (menu != null) { cm.getItems().add(menu); @@ -445,6 +448,7 @@ public abstract class StoreEntryComp extends SimpleComp { if (branch != null) { var items = branch.getChildren(getWrapper().getEntry().ref()).stream() + .filter(actionProvider -> getWrapper().showActionProvider(actionProvider)) .map(c -> buildMenuItemForAction(c)) .toList(); menu.getItems().addAll(items); diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreEntryWrapper.java b/app/src/main/java/io/xpipe/app/comp/store/StoreEntryWrapper.java index 42835225b..ed2b0f5aa 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreEntryWrapper.java +++ b/app/src/main/java/io/xpipe/app/comp/store/StoreEntryWrapper.java @@ -194,7 +194,7 @@ public class StoreEntryWrapper { } } - private boolean showActionProvider(ActionProvider p) { + public boolean showActionProvider(ActionProvider p) { var leaf = p.getLeafDataStoreCallSite(); if (leaf != null) { return (entry.getValidity().isUsable() || (!leaf.requiresValidStore() && entry.getProvider() != null)) diff --git a/app/src/main/java/io/xpipe/app/core/check/AppRosettaCheck.java b/app/src/main/java/io/xpipe/app/core/check/AppRosettaCheck.java index 175fd28a1..c97b14478 100644 --- a/app/src/main/java/io/xpipe/app/core/check/AppRosettaCheck.java +++ b/app/src/main/java/io/xpipe/app/core/check/AppRosettaCheck.java @@ -27,6 +27,7 @@ public class AppRosettaCheck { ErrorEvent.fromMessage("You are running the Intel version of XPipe on an Apple Silicon system." + " There is a native build available that comes with much better performance." + " Please install that one instead.") + .noDefaultActions() .expected() .handle(); } diff --git a/app/src/main/java/io/xpipe/app/util/TerminalLauncherManager.java b/app/src/main/java/io/xpipe/app/util/TerminalLauncherManager.java index d09906f6c..d65952f63 100644 --- a/app/src/main/java/io/xpipe/app/util/TerminalLauncherManager.java +++ b/app/src/main/java/io/xpipe/app/util/TerminalLauncherManager.java @@ -109,6 +109,7 @@ public class TerminalLauncherManager { synchronized (entries) { var r = e.getResult(); + e.setLaunched(true); if (r instanceof ResultFailure failure) { var t = failure.getThrowable(); throw new BeaconServerException(t); @@ -133,7 +134,6 @@ public class TerminalLauncherManager { throw new BeaconClientException("Invalid launch request state " + request); } - e.setLaunched(true); return ((ResultSuccess) e.getResult()).getTargetScript(); } } diff --git a/app/src/main/resources/io/xpipe/app/resources/style/color-box.css b/app/src/main/resources/io/xpipe/app/resources/style/color-box.css index 558594f37..20549a58f 100644 --- a/app/src/main/resources/io/xpipe/app/resources/style/color-box.css +++ b/app/src/main/resources/io/xpipe/app/resources/style/color-box.css @@ -63,12 +63,12 @@ .root:pretty:light .color-box.red { - -fx-background-color: linear-gradient(from 100% 0% to 0% 100%, rgb(220, 100, 100, 0.1) 40%, rgb(205, 50, 50, 0.1) 50%, rgb(200, 90, 90, 0.1) 100%); + -fx-background-color: linear-gradient(from 100% 0% to 0% 100%, rgb(250, 100, 100, 0.06) 40%, rgb(245, 50, 50, 0.06) 50%, rgb(240, 90, 90, 0.06) 100%); -fx-border-color: rgba(150, 100, 80, 0.6); } .root:performance:light .color-box.red { - -fx-background-color: rgb(220, 100, 100, 0.1); + -fx-background-color: rgb(250, 100, 100, 0.06); -fx-border-color: rgba(150, 100, 80, 0.6); }