beenull/xpipe-mirror
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-11-25 09:00:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Various fixes

Browse source
This commit is contained in:
crschnick 2024-09-27 15:28:53 +00:00
parent ca0df83c91
commit d940e99068
5 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/io/xpipe/app/comp/store/StoreEntryComp.java
View file

@ -245,7 +245,10 @@ public abstract class StoreEntryComp extends SimpleComp {
button.apply(new ContextMenuAugment<>( button.apply(new ContextMenuAugment<>(
mouseEvent -> mouseEvent.getButton() == MouseButton.PRIMARY, keyEvent -> false, () -> { mouseEvent -> mouseEvent.getButton() == MouseButton.PRIMARY, keyEvent -> false, () -> {
var cm = ContextMenuHelper.create(); 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); var menu = buildMenuItemForAction(childProvider);
if (menu != null) { if (menu != null) {
cm.getItems().add(menu); cm.getItems().add(menu);
@ -445,6 +448,7 @@ public abstract class StoreEntryComp extends SimpleComp {
if (branch != null) { if (branch != null) {
var items = branch.getChildren(getWrapper().getEntry().ref()).stream() var items = branch.getChildren(getWrapper().getEntry().ref()).stream()
.filter(actionProvider -> getWrapper().showActionProvider(actionProvider))
.map(c -> buildMenuItemForAction(c)) .map(c -> buildMenuItemForAction(c))
.toList(); .toList();
menu.getItems().addAll(items); menu.getItems().addAll(items);

2
app/src/main/java/io/xpipe/app/comp/store/StoreEntryWrapper.java
View file

@ -194,7 +194,7 @@ public class StoreEntryWrapper {
} }
} }
private boolean showActionProvider(ActionProvider p) { public boolean showActionProvider(ActionProvider p) {
var leaf = p.getLeafDataStoreCallSite(); var leaf = p.getLeafDataStoreCallSite();
if (leaf != null) { if (leaf != null) {
return (entry.getValidity().isUsable() || (!leaf.requiresValidStore() && entry.getProvider() != null)) return (entry.getValidity().isUsable() || (!leaf.requiresValidStore() && entry.getProvider() != null))

1
app/src/main/java/io/xpipe/app/core/check/AppRosettaCheck.java
View file

@ -27,6 +27,7 @@ public class AppRosettaCheck {
ErrorEvent.fromMessage("You are running the Intel version of XPipe on an Apple Silicon system." 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." + " There is a native build available that comes with much better performance."
+ " Please install that one instead.") + " Please install that one instead.")
.noDefaultActions()
.expected() .expected()
.handle(); .handle();
} }

2
app/src/main/java/io/xpipe/app/util/TerminalLauncherManager.java
View file

@ -109,6 +109,7 @@ public class TerminalLauncherManager {
synchronized (entries) { synchronized (entries) {
var r = e.getResult(); var r = e.getResult();
e.setLaunched(true);
if (r instanceof ResultFailure failure) { if (r instanceof ResultFailure failure) {
var t = failure.getThrowable(); var t = failure.getThrowable();
throw new BeaconServerException(t); throw new BeaconServerException(t);
@ -133,7 +134,6 @@ public class TerminalLauncherManager {
throw new BeaconClientException("Invalid launch request state " + request); throw new BeaconClientException("Invalid launch request state " + request);
} }
e.setLaunched(true);
return ((ResultSuccess) e.getResult()).getTargetScript(); return ((ResultSuccess) e.getResult()).getTargetScript();
} }
} }

4
app/src/main/resources/io/xpipe/app/resources/style/color-box.css
View file

@ -63,12 +63,12 @@
.root:pretty:light .color-box.red { .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); -fx-border-color: rgba(150, 100, 80, 0.6);
} }
.root:performance:light .color-box.red { .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); -fx-border-color: rgba(150, 100, 80, 0.6);
} }