diff --git a/app/src/main/java/io/xpipe/app/comp/base/ListSelectorComp.java b/app/src/main/java/io/xpipe/app/comp/base/ListSelectorComp.java index c0c5f70ed..6000be622 100644 --- a/app/src/main/java/io/xpipe/app/comp/base/ListSelectorComp.java +++ b/app/src/main/java/io/xpipe/app/comp/base/ListSelectorComp.java @@ -88,6 +88,7 @@ public class ListSelectorComp extends SimpleComp { var sp = new ScrollPane(vbox); sp.setFitToWidth(true); + sp.getStyleClass().add("list-selector-comp"); return sp; } } diff --git a/app/src/main/java/io/xpipe/app/fxcomps/impl/OptionsComp.java b/app/src/main/java/io/xpipe/app/fxcomps/impl/OptionsComp.java index 223d0db1f..573da420c 100644 --- a/app/src/main/java/io/xpipe/app/fxcomps/impl/OptionsComp.java +++ b/app/src/main/java/io/xpipe/app/fxcomps/impl/OptionsComp.java @@ -33,13 +33,6 @@ public class OptionsComp extends Comp> { this.entries = entries; } - public OptionsComp.Entry queryEntry(String key) { - return entries.stream() - .filter(entry -> entry.key != null && entry.key.equals(key)) - .findAny() - .orElseThrow(); - } - @Override public CompStructure createBase() { Pane pane; @@ -70,6 +63,7 @@ public class OptionsComp extends Comp> { name.getStyleClass().add("name"); name.textProperty().bind(entry.name()); name.setMinWidth(Region.USE_PREF_SIZE); + name.setMinHeight(Region.USE_PREF_SIZE); name.setAlignment(Pos.CENTER_LEFT); if (compRegion != null) { name.visibleProperty().bind(PlatformThread.sync(compRegion.visibleProperty())); @@ -82,6 +76,7 @@ public class OptionsComp extends Comp> { description.getStyleClass().add("description"); description.textProperty().bind(entry.description()); description.setAlignment(Pos.CENTER_LEFT); + description.setMinHeight(Region.USE_PREF_SIZE); if (compRegion != null) { description.visibleProperty().bind(PlatformThread.sync(compRegion.visibleProperty())); description.managedProperty().bind(PlatformThread.sync(compRegion.managedProperty())); diff --git a/app/src/main/java/io/xpipe/app/util/ScanAlert.java b/app/src/main/java/io/xpipe/app/util/ScanAlert.java index ddd0379e4..c2d8a7f80 100644 --- a/app/src/main/java/io/xpipe/app/util/ScanAlert.java +++ b/app/src/main/java/io/xpipe/app/util/ScanAlert.java @@ -141,6 +141,11 @@ public class ScanAlert { }); } + @Override + protected Comp pane(Comp content) { + return content; + } + @Override public Comp content() { StackPane stackPane = new StackPane(); @@ -166,7 +171,7 @@ public class ScanAlert { .apply(struc -> { VBox.setVgrow(struc.get().getChildren().get(1), ALWAYS); }) - .padding(new Insets(20)); + .padding(new Insets(5, 20, 20, 20)); entry.subscribe(newValue -> { selected.clear(); diff --git a/app/src/main/resources/io/xpipe/app/resources/style/style.css b/app/src/main/resources/io/xpipe/app/resources/style/style.css index 747928eb2..b9c77be98 100644 --- a/app/src/main/resources/io/xpipe/app/resources/style/style.css +++ b/app/src/main/resources/io/xpipe/app/resources/style/style.css @@ -96,11 +96,15 @@ -fx-background-radius: 4px; -fx-border-width: 0.05em; -fx-border-radius: 4px; - -fx-padding: 1em; + -fx-padding: 1px; -fx-background-color: -color-bg-default; -fx-border-color: -color-neutral-emphasis; } +.scan-list .list-content { + -fx-padding: 0.7em 1px 1em 1em; +} + * { -fx-font-smoothing-type: gray; } @@ -128,7 +132,3 @@ .root:dark .loading-comp { -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; } diff --git a/core/src/main/java/io/xpipe/core/process/ShellDialect.java b/core/src/main/java/io/xpipe/core/process/ShellDialect.java index 943c4931e..e4f474ef3 100644 --- a/core/src/main/java/io/xpipe/core/process/ShellDialect.java +++ b/core/src/main/java/io/xpipe/core/process/ShellDialect.java @@ -105,8 +105,6 @@ public interface ShellDialect { String nullStdin(String command); - String getScriptPermissionsCommand(String file); - ShellDialectAskpass getAskpass(); String getSetEnvironmentVariableCommand(String variable, String value); @@ -133,8 +131,6 @@ public interface ShellDialect { CommandBuilder getOpenScriptCommand(String file); - default void prepareCommandForShell(CommandBuilder b) {} - String prepareTerminalInitFileOpenCommand(ShellDialect parentDialect, ShellControl sc, String file, boolean exit); String runScriptCommand(ShellControl parent, String file); diff --git a/lang/proc/strings/fixed_en.properties b/lang/proc/strings/fixed_en.properties index 3a5058deb..2bace7e8f 100644 --- a/lang/proc/strings/fixed_en.properties +++ b/lang/proc/strings/fixed_en.properties @@ -11,3 +11,4 @@ odd=Odd even=Even mark=Mark space=Space +teleport=Teleport \ No newline at end of file