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

Small fixes

Browse source
This commit is contained in:
crschnick 2024-08-11 09:22:51 +00:00
parent 0ad8df23b6
commit 9b7cca8589
6 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/io/xpipe/app/comp/base/ListSelectorComp.java
View file

@ -88,6 +88,7 @@ public class ListSelectorComp<T> extends SimpleComp {
var sp = new ScrollPane(vbox); var sp = new ScrollPane(vbox);
sp.setFitToWidth(true); sp.setFitToWidth(true);
sp.getStyleClass().add("list-selector-comp");
return sp; return sp;
} }
} }

9
app/src/main/java/io/xpipe/app/fxcomps/impl/OptionsComp.java
View file

@ -33,13 +33,6 @@ public class OptionsComp extends Comp<CompStructure<Pane>> {
this.entries = entries; this.entries = entries;
} }
public OptionsComp.Entry queryEntry(String key) {
return entries.stream()
.filter(entry -> entry.key != null && entry.key.equals(key))
.findAny()
.orElseThrow();
}
@Override @Override
public CompStructure<Pane> createBase() { public CompStructure<Pane> createBase() {
Pane pane; Pane pane;
@ -70,6 +63,7 @@ public class OptionsComp extends Comp<CompStructure<Pane>> {
name.getStyleClass().add("name"); name.getStyleClass().add("name");
name.textProperty().bind(entry.name()); name.textProperty().bind(entry.name());
name.setMinWidth(Region.USE_PREF_SIZE); name.setMinWidth(Region.USE_PREF_SIZE);
name.setMinHeight(Region.USE_PREF_SIZE);
name.setAlignment(Pos.CENTER_LEFT); name.setAlignment(Pos.CENTER_LEFT);
if (compRegion != null) { if (compRegion != null) {
name.visibleProperty().bind(PlatformThread.sync(compRegion.visibleProperty())); name.visibleProperty().bind(PlatformThread.sync(compRegion.visibleProperty()));
@ -82,6 +76,7 @@ public class OptionsComp extends Comp<CompStructure<Pane>> {
description.getStyleClass().add("description"); description.getStyleClass().add("description");
description.textProperty().bind(entry.description()); description.textProperty().bind(entry.description());
description.setAlignment(Pos.CENTER_LEFT); description.setAlignment(Pos.CENTER_LEFT);
description.setMinHeight(Region.USE_PREF_SIZE);
if (compRegion != null) { if (compRegion != null) {
description.visibleProperty().bind(PlatformThread.sync(compRegion.visibleProperty())); description.visibleProperty().bind(PlatformThread.sync(compRegion.visibleProperty()));
description.managedProperty().bind(PlatformThread.sync(compRegion.managedProperty())); description.managedProperty().bind(PlatformThread.sync(compRegion.managedProperty()));

7
app/src/main/java/io/xpipe/app/util/ScanAlert.java
View file

@ -141,6 +141,11 @@ public class ScanAlert {
}); });
} }
@Override
protected Comp<?> pane(Comp<?> content) {
return content;
}
@Override @Override
public Comp<?> content() { public Comp<?> content() {
StackPane stackPane = new StackPane(); StackPane stackPane = new StackPane();
@ -166,7 +171,7 @@ public class ScanAlert {
.apply(struc -> { .apply(struc -> {
VBox.setVgrow(struc.get().getChildren().get(1), ALWAYS); VBox.setVgrow(struc.get().getChildren().get(1), ALWAYS);
}) })
.padding(new Insets(20)); .padding(new Insets(5, 20, 20, 20));
entry.subscribe(newValue -> { entry.subscribe(newValue -> {
selected.clear(); selected.clear();

10
app/src/main/resources/io/xpipe/app/resources/style/style.css
View file

@ -96,11 +96,15 @@
-fx-background-radius: 4px; -fx-background-radius: 4px;
-fx-border-width: 0.05em; -fx-border-width: 0.05em;
-fx-border-radius: 4px; -fx-border-radius: 4px;
-fx-padding: 1em; -fx-padding: 1px;
-fx-background-color: -color-bg-default; -fx-background-color: -color-bg-default;
-fx-border-color: -color-neutral-emphasis; -fx-border-color: -color-neutral-emphasis;
} }
.scan-list .list-content {
-fx-padding: 0.7em 1px 1em 1em;
}
* { * {
-fx-font-smoothing-type: gray; -fx-font-smoothing-type: gray;
} }
@ -128,7 +132,3 @@
.root:dark .loading-comp { .root:dark .loading-comp {
-fx-background-color: rgba(0, 0, 0, 0.5); -fx-background-color: rgba(0, 0, 0, 0.5);
} }
.root:light .stacked-ikonli-font-icon > .background-icon { -fx-opacity: 0; }
.stacked-ikonli-font-icon > .background-icon { -fx-opacity: 0.2; }

4
core/src/main/java/io/xpipe/core/process/ShellDialect.java
View file

@ -105,8 +105,6 @@ public interface ShellDialect {
String nullStdin(String command); String nullStdin(String command);
String getScriptPermissionsCommand(String file);
ShellDialectAskpass getAskpass(); ShellDialectAskpass getAskpass();
String getSetEnvironmentVariableCommand(String variable, String value); String getSetEnvironmentVariableCommand(String variable, String value);
@ -133,8 +131,6 @@ public interface ShellDialect {
CommandBuilder getOpenScriptCommand(String file); CommandBuilder getOpenScriptCommand(String file);
default void prepareCommandForShell(CommandBuilder b) {}
String prepareTerminalInitFileOpenCommand(ShellDialect parentDialect, ShellControl sc, String file, boolean exit); String prepareTerminalInitFileOpenCommand(ShellDialect parentDialect, ShellControl sc, String file, boolean exit);
String runScriptCommand(ShellControl parent, String file); String runScriptCommand(ShellControl parent, String file);

1
lang/proc/strings/fixed_en.properties
View file

@ -11,3 +11,4 @@ odd=Odd
even=Even even=Even
mark=Mark mark=Mark
space=Space space=Space
teleport=Teleport