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

Small fixes relating to shells

Browse source
This commit is contained in:
Christopher Schnick 2022-12-16 19:49:40 +01:00
parent a2cdcb149a
commit 1e0c7d0505
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/src/main/java/io/xpipe/core/process/CommandProcessControl.java
View file

@ -7,6 +7,8 @@ import java.util.function.Consumer;
public interface CommandProcessControl extends ProcessControl { public interface CommandProcessControl extends ProcessControl {
CommandProcessControl complex();
default InputStream startExternalStdout() throws Exception { default InputStream startExternalStdout() throws Exception {
try { try {
start(); start();

11
extension/src/main/java/io/xpipe/extension/fxcomps/impl/TextAreaComp.java
View file

@ -2,6 +2,7 @@ package io.xpipe.extension.fxcomps.impl;
import io.xpipe.extension.fxcomps.SimpleComp; import io.xpipe.extension.fxcomps.SimpleComp;
import io.xpipe.extension.fxcomps.util.PlatformThread; import io.xpipe.extension.fxcomps.util.PlatformThread;
import io.xpipe.extension.fxcomps.util.SimpleChangeListener;
import javafx.beans.binding.Bindings; import javafx.beans.binding.Bindings;
import javafx.beans.property.Property; import javafx.beans.property.Property;
import javafx.beans.property.SimpleStringProperty; import javafx.beans.property.SimpleStringProperty;
@ -14,7 +15,7 @@ import java.util.Objects;
public class TextAreaComp extends SimpleComp { public class TextAreaComp extends SimpleComp {
private final Property<String> value; private final Property<String> value;
private final Property<String> lazyValue = new SimpleStringProperty(); private final Property<String> lazyValue;
private final boolean lazy; private final boolean lazy;
public TextAreaComp(Property<String> value) { public TextAreaComp(Property<String> value) {
@ -22,16 +23,20 @@ public class TextAreaComp extends SimpleComp {
} }
public TextAreaComp(Property<String> value, boolean lazy) { public TextAreaComp(Property<String> value, boolean lazy) {
this.value = value; this.lazyValue = value;
this.value = new SimpleStringProperty(value.getValue());
this.lazy = lazy; this.lazy = lazy;
if (!lazy) { if (!lazy) {
value.bind(lazyValue); SimpleChangeListener.apply(value, val -> {
value.setValue(val);
});
} }
} }
@Override @Override
protected Region createSimple() { protected Region createSimple() {
var text = new TextArea(value.getValue() != null ? value.getValue() : null); var text = new TextArea(value.getValue() != null ? value.getValue() : null);
text.setPrefRowCount(5);
text.textProperty().addListener((c, o, n) -> { text.textProperty().addListener((c, o, n) -> {
lazyValue.setValue(n != null && n.length() > 0 ? n : null); lazyValue.setValue(n != null && n.length() > 0 ? n : null);
}); });