mirror of
https://github.com/xpipe-io/xpipe.git
synced 2024-06-24 17:10:19 +12:00
Fixes [stage]
This commit is contained in:
parent
ccb4e06809
commit
51f7e3f4f5
|
@ -244,7 +244,10 @@ public abstract class StoreEntryComp extends SimpleComp {
|
||||||
list.getLast().styleClass(Styles.RIGHT_PILL);
|
list.getLast().styleClass(Styles.RIGHT_PILL);
|
||||||
}
|
}
|
||||||
list.forEach(comp -> {
|
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)
|
return new HorizontalComp(list)
|
||||||
.apply(struc -> {
|
.apply(struc -> {
|
||||||
|
|
|
@ -614,7 +614,7 @@ public interface ExternalTerminalType extends PrefsChoiceValue {
|
||||||
|
|
||||||
List<ExternalTerminalType> ALL = getTypes(OsType.getLocal(), false, true);
|
List<ExternalTerminalType> ALL = getTypes(OsType.getLocal(), false, true);
|
||||||
|
|
||||||
List<ExternalTerminalType> ALL_CROSS_PLATFORM = getTypes(null, false, true);
|
List<ExternalTerminalType> ALL_ON_ALL_PLATFORMS = getTypes(null, false, true);
|
||||||
|
|
||||||
static List<ExternalTerminalType> getTypes(OsType osType, boolean remote, boolean custom) {
|
static List<ExternalTerminalType> getTypes(OsType osType, boolean remote, boolean custom) {
|
||||||
var all = new ArrayList<ExternalTerminalType>();
|
var all = new ArrayList<ExternalTerminalType>();
|
||||||
|
|
|
@ -68,7 +68,7 @@ public class AppJacksonModule extends SimpleModule {
|
||||||
@Override
|
@Override
|
||||||
public ExternalTerminalType deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
|
public ExternalTerminalType deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
|
||||||
var id = p.getValueAsString();
|
var id = p.getValueAsString();
|
||||||
return ExternalTerminalType.ALL.stream()
|
return ExternalTerminalType.ALL_ON_ALL_PLATFORMS.stream()
|
||||||
.filter(terminalType -> terminalType.getId().equals(id))
|
.filter(terminalType -> terminalType.getId().equals(id))
|
||||||
.findFirst()
|
.findFirst()
|
||||||
.orElse(null);
|
.orElse(null);
|
||||||
|
|
Loading…
Reference in a new issue