From fb11db6a666dcd3f28c457ebf05faaed7d6a5a04 Mon Sep 17 00:00:00 2001 From: crschnick Date: Fri, 1 Nov 2024 14:15:02 +0000 Subject: [PATCH] Various fixes --- app/src/main/java/io/xpipe/app/ext/ShellStore.java | 1 + app/src/main/java/io/xpipe/app/ext/WrapperShellControl.java | 5 +++++ .../main/resources/io/xpipe/app/resources/style/browser.css | 4 ++++ .../main/resources/io/xpipe/app/resources/style/style.css | 2 +- core/src/main/java/io/xpipe/core/process/ProcessControl.java | 2 ++ dist/build.gradle | 2 +- 6 files changed, 14 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/io/xpipe/app/ext/ShellStore.java b/app/src/main/java/io/xpipe/app/ext/ShellStore.java index d477e904e..a8b763ca2 100644 --- a/app/src/main/java/io/xpipe/app/ext/ShellStore.java +++ b/app/src/main/java/io/xpipe/app/ext/ShellStore.java @@ -9,6 +9,7 @@ public interface ShellStore extends DataStore, FileSystemStore, ValidatableStore default ShellControl getOrStartSession() throws Exception { var session = getSession(); if (session != null) { + session.getShellControl().refreshRunningState(); if (!session.isRunning()) { stopSessionIfNeeded(); } else { diff --git a/app/src/main/java/io/xpipe/app/ext/WrapperShellControl.java b/app/src/main/java/io/xpipe/app/ext/WrapperShellControl.java index de93baf84..5d56d5601 100644 --- a/app/src/main/java/io/xpipe/app/ext/WrapperShellControl.java +++ b/app/src/main/java/io/xpipe/app/ext/WrapperShellControl.java @@ -178,6 +178,11 @@ public class WrapperShellControl implements ShellControl { return parent.prepareTerminalOpen(config, workingDirectory); } + @Override + public void refreshRunningState() { + parent.refreshRunningState(); + } + @Override public void closeStdin() throws IOException { parent.closeStdin(); diff --git a/app/src/main/resources/io/xpipe/app/resources/style/browser.css b/app/src/main/resources/io/xpipe/app/resources/style/browser.css index 6f41c1e48..21dbe4121 100644 --- a/app/src/main/resources/io/xpipe/app/resources/style/browser.css +++ b/app/src/main/resources/io/xpipe/app/resources/style/browser.css @@ -37,6 +37,10 @@ -fx-padding: 0.1em 0.2em; } +.browser .transfer .label .ikonli-font-icon { + -fx-icon-color: -color-fg-default; +} + .root.nord .transfer > * { -fx-background-radius: 0; -fx-border-radius: 0; 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 1fe509821..ef0b124b9 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 @@ -165,6 +165,6 @@ -fx-fill: rgb(30, 180, 30, 0.7); } -.custom-text-field .font-icon, .custom-text-field .ikonli-font-icon, .label .ikonli-font-icon { +.custom-text-field .font-icon, .custom-text-field .ikonli-font-icon { -fx-icon-color: -color-fg-default; } diff --git a/core/src/main/java/io/xpipe/core/process/ProcessControl.java b/core/src/main/java/io/xpipe/core/process/ProcessControl.java index ef489093d..38d79883a 100644 --- a/core/src/main/java/io/xpipe/core/process/ProcessControl.java +++ b/core/src/main/java/io/xpipe/core/process/ProcessControl.java @@ -17,6 +17,8 @@ public interface ProcessControl extends AutoCloseable { String prepareTerminalOpen(TerminalInitScriptConfig config, WorkingDirectoryFunction workingDirectory) throws Exception; + void refreshRunningState(); + void closeStdin() throws IOException; boolean isStdinClosed(); diff --git a/dist/build.gradle b/dist/build.gradle index 2593a28c2..a173de9b2 100644 --- a/dist/build.gradle +++ b/dist/build.gradle @@ -2,7 +2,7 @@ plugins { id 'org.beryx.jlink' version '3.0.1' id "org.asciidoctor.jvm.convert" version "4.0.3" - id 'org.jreleaser' version '1.14.0' + id 'org.jreleaser' version '1.15.0' id("com.netflix.nebula.ospackage") version "11.10.0" id 'org.gradle.crypto.checksum' version '1.4.0' id 'signing'