From 51f7e3f4f517e357d4623fe8ebd81341eedb8990 Mon Sep 17 00:00:00 2001 From: crschnick Date: Sat, 20 Apr 2024 10:25:02 +0000 Subject: [PATCH] Fixes [stage] --- .../main/java/io/xpipe/app/comp/store/StoreEntryComp.java | 5 ++++- .../java/io/xpipe/app/terminal/ExternalTerminalType.java | 2 +- app/src/main/java/io/xpipe/app/util/AppJacksonModule.java | 2 +- version | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) 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 e4546cbb..a7bdfc9a 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 @@ -244,7 +244,10 @@ public abstract class StoreEntryComp extends SimpleComp { list.getLast().styleClass(Styles.RIGHT_PILL); } list.forEach(comp -> { - comp.apply(struc -> struc.get().getStyleClass().remove(Styles.FLAT)); + comp.apply(struc -> { + struc.get().getStyleClass().remove(Styles.FLAT); + }); + comp.grow(false, true); }); return new HorizontalComp(list) .apply(struc -> { diff --git a/app/src/main/java/io/xpipe/app/terminal/ExternalTerminalType.java b/app/src/main/java/io/xpipe/app/terminal/ExternalTerminalType.java index fb2f28ab..ae37d29a 100644 --- a/app/src/main/java/io/xpipe/app/terminal/ExternalTerminalType.java +++ b/app/src/main/java/io/xpipe/app/terminal/ExternalTerminalType.java @@ -614,7 +614,7 @@ public interface ExternalTerminalType extends PrefsChoiceValue { List ALL = getTypes(OsType.getLocal(), false, true); - List ALL_CROSS_PLATFORM = getTypes(null, false, true); + List ALL_ON_ALL_PLATFORMS = getTypes(null, false, true); static List getTypes(OsType osType, boolean remote, boolean custom) { var all = new ArrayList(); diff --git a/app/src/main/java/io/xpipe/app/util/AppJacksonModule.java b/app/src/main/java/io/xpipe/app/util/AppJacksonModule.java index e6c70db9..54a01faa 100644 --- a/app/src/main/java/io/xpipe/app/util/AppJacksonModule.java +++ b/app/src/main/java/io/xpipe/app/util/AppJacksonModule.java @@ -68,7 +68,7 @@ public class AppJacksonModule extends SimpleModule { @Override public ExternalTerminalType deserialize(JsonParser p, DeserializationContext ctxt) throws IOException { var id = p.getValueAsString(); - return ExternalTerminalType.ALL.stream() + return ExternalTerminalType.ALL_ON_ALL_PLATFORMS.stream() .filter(terminalType -> terminalType.getId().equals(id)) .findFirst() .orElse(null); diff --git a/version b/version index 42ea1ec5..abd7a92a 100644 --- a/version +++ b/version @@ -1 +1 @@ -9.0-6 +9.0-7