Merge adjustments [release]

CONTRIBUTING.md

@@ -20,8 +20,8 @@ If you are on Linux or macOS, you can easily accomplish that by using [SDKMAN](h
 ```bash
 curl -s "https://get.sdkman.io" | bash
 . "$HOME/.sdkman/bin/sdkman-init.sh"
-sdk install java 25.0.1-graalce
-sdk default java 25.0.1-graalce
+sdk install java 25.0.2-graalce
+sdk default java 25.0.2-graalce
 ```
 
 On Windows, you have to manually install a JDK, e.g. from [Adoptium](https://adoptium.net/temurin/releases/?version=25).

app/src/main/java/io/xpipe/app/terminal/TerminalDockHubManager.java

@@ -110,9 +110,9 @@ public class TerminalDockHubManager {
     private final AppLayoutModel.QueueEntry queueEntry = new AppLayoutModel.QueueEntry(
             AppI18n.observable("toggleTerminalDock"), new LabelGraphic.NodeGraphic(() -> {
                 var inner = new FontIcon();
-                inner.iconCodeProperty().bind(Bindings.createObjectBinding(() -> {
-                    return detached.get() || minimized.get() ? MaterialDesignC.CONSOLE_LINE : MaterialDesignC.CONSOLE;
-                }, detached, minimized));
+                inner.iconCodeProperty().bind(PlatformThread.sync(Bindings.createObjectBinding(() -> {
+                    return detached.get() || minimized.get() || !showing.get() ? MaterialDesignC.CONSOLE_LINE : MaterialDesignC.CONSOLE;
+                }, detached, minimized, showing)));
                 inner.getStyleClass().add("graphic");
                 inner.getStyleClass().add("terminal-dock-button");
                 return inner;

app/src/main/java/io/xpipe/app/terminal/TerminalDockView.java

@@ -81,11 +81,6 @@ public class TerminalDockView {
             // We always want to show the terminal though
             terminal.show();
 
-            terminal.own();
-
-            // Bring terminal window in front of main window
-            terminal.focus();
-            
             terminal.updatePosition(windowBoundsFunction.apply(viewBounds));
             updateCustomBounds();
         }

dist/changelog/21.3.md

@@ -29,17 +29,17 @@ The MCP integration can also now be used to manage cisco switches via the new in
 
 ## Other
 
-- Add support for all other Keeper password manager 2FA methods
-- Fix vault sync failing in OneDrive directories
+- Add support for all other Keeper password manager 2FA methods (you have to reconfigure this in the settings menu if you already use Keeper with 2FA)
+- Fix vault sync for plain directories failing in OneDrive directories
+- Fix vault sync for plain directories not working well with immediate sync mode
 - Improve rendering performance on Windows
 - Add support for neovim editor (Thanks to @leycm)
-- Add browser context menu action for gradlew files to run tasks (Thanks to @leycm)
-- Fix AUR update failing if git core.autocrlf was set to true (Thanks to @leycm)
 - Fix WezTerm not using tabs on Linux (Thanks to @leycm)
 - Fix WezTerm tab titles not being overridden (Thanks to @leycm)
+- Add browser context menu action for gradlew files to run tasks (Thanks to @leycm)
+- Fix AUR update failing if git core.autocrlf was set to true (Thanks to @leycm)
 - Fix SSH config update for VsCode integration creating connection duplicates
 - Fix various terminal updaters instantly closing when update failed
 - Fix VsCode not launching in Webtop due to sandbox restrictions
 - Add custom theming to Webtop
 - Fix various NullPointers
-

dist/licenses/graalvm.properties

@@ -1,4 +1,4 @@
 name=GraalVM Community
-version=25.0.1
+version=25.0.2
 license=GPL2 with the Classpath Exception
 link=https://www.graalvm.org/

version

@@ -1 +1 @@
-21.3-10
+21.3