From 9208e52e8392038a0e590bc972073f56d5b2fe45 Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Thu, 14 Nov 2024 19:43:35 +0000
Subject: [PATCH] Small fixes [stage]

---
 .../io/xpipe/app/browser/BrowserFullSessionComp.java   | 10 +++++++---
 .../io/xpipe/app/browser/BrowserSessionTabsComp.java   |  1 +
 .../app/browser/file/BrowserFileSystemTabModel.java    |  5 +++++
 .../java/io/xpipe/app/terminal/TerminalDockComp.java   |  2 ++
 .../io/xpipe/app/terminal/WindowsTerminalSession.java  |  2 +-
 .../resources/io/xpipe/app/resources/style/browser.css |  2 +-
 dist/changelogs/13.0.md                                |  2 +-
 version                                                |  2 +-
 8 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/io/xpipe/app/browser/BrowserFullSessionComp.java b/app/src/main/java/io/xpipe/app/browser/BrowserFullSessionComp.java
index e68c7391b..c5081f2fc 100644
--- a/app/src/main/java/io/xpipe/app/browser/BrowserFullSessionComp.java
+++ b/app/src/main/java/io/xpipe/app/browser/BrowserFullSessionComp.java
@@ -171,8 +171,8 @@ public class BrowserFullSessionComp extends SimpleComp {
 
     private StackComp createSplitStack(SimpleDoubleProperty rightSplit, BrowserSessionTabsComp tabs) {
         var cache = new HashMap<BrowserSessionTab, Region>();
-        var pinnedStack = new StackComp(List.of());
-        pinnedStack.apply(struc -> {
+        var splitStack = new StackComp(List.of());
+        splitStack.apply(struc -> {
             model.getEffectiveRightTab().subscribe((newValue) -> {
                 PlatformThread.runLaterIfNeeded(() -> {
                     var all = model.getAllTabs();
@@ -190,6 +190,10 @@ public class BrowserFullSessionComp extends SimpleComp {
                     var r = cache.get(newValue);
                     struc.get().getChildren().clear();
                     struc.get().getChildren().add(r);
+
+                    struc.get().setMinWidth(rightSplit.get());
+                    struc.get().setMaxWidth(rightSplit.get());
+                    struc.get().setPrefWidth(rightSplit.get());
                 });
             });
 
@@ -205,6 +209,6 @@ public class BrowserFullSessionComp extends SimpleComp {
                 AnchorPane.setTopAnchor(struc.get(), number.doubleValue());
             });
         });
-        return pinnedStack;
+        return splitStack;
     }
 }
diff --git a/app/src/main/java/io/xpipe/app/browser/BrowserSessionTabsComp.java b/app/src/main/java/io/xpipe/app/browser/BrowserSessionTabsComp.java
index ea33c8ec1..10822d6f9 100644
--- a/app/src/main/java/io/xpipe/app/browser/BrowserSessionTabsComp.java
+++ b/app/src/main/java/io/xpipe/app/browser/BrowserSessionTabsComp.java
@@ -424,6 +424,7 @@ public class BrowserSessionTabsComp extends SimpleComp {
         Comp<?> comp = tabModel.comp();
         var compRegion = comp.createRegion();
         var empty = new StackPane();
+        empty.setMinWidth(100);
         empty.widthProperty().addListener((observable, oldValue, newValue) -> {
             if (tabModel.isCloseable() && tabs.getSelectionModel().getSelectedItem() == tab) {
                 rightPadding.setValue(newValue.doubleValue());
diff --git a/app/src/main/java/io/xpipe/app/browser/file/BrowserFileSystemTabModel.java b/app/src/main/java/io/xpipe/app/browser/file/BrowserFileSystemTabModel.java
index e746914f4..864f3a8de 100644
--- a/app/src/main/java/io/xpipe/app/browser/file/BrowserFileSystemTabModel.java
+++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserFileSystemTabModel.java
@@ -6,6 +6,7 @@ import io.xpipe.app.browser.BrowserStoreSessionTab;
 import io.xpipe.app.browser.action.BrowserAction;
 import io.xpipe.app.comp.Comp;
 import io.xpipe.app.comp.base.ModalOverlayComp;
+import io.xpipe.app.core.window.AppMainWindow;
 import io.xpipe.app.ext.ProcessControlProvider;
 import io.xpipe.app.ext.ShellStore;
 import io.xpipe.app.issue.ErrorEvent;
@@ -214,6 +215,10 @@ public final class BrowserFileSystemTabModel extends BrowserStoreSessionTab<File
             return false;
         }
 
+        if (AppMainWindow.getInstance().getStage().getWidth() <= 1280) {
+            return false;
+        }
+
         var term = AppPrefs.get().terminalType().getValue();
         if (term == null || term.getOpenFormat() == TerminalOpenFormat.TABBED) {
             return false;
diff --git a/app/src/main/java/io/xpipe/app/terminal/TerminalDockComp.java b/app/src/main/java/io/xpipe/app/terminal/TerminalDockComp.java
index d6c647a48..f9ec2d94a 100644
--- a/app/src/main/java/io/xpipe/app/terminal/TerminalDockComp.java
+++ b/app/src/main/java/io/xpipe/app/terminal/TerminalDockComp.java
@@ -74,6 +74,8 @@ public class TerminalDockComp extends SimpleComp {
             event.consume();
         });
         stack.getStyleClass().add("terminal-dock-comp");
+        stack.setMinWidth(100);
+        stack.setMinHeight(100);
         return stack;
     }
 
diff --git a/app/src/main/java/io/xpipe/app/terminal/WindowsTerminalSession.java b/app/src/main/java/io/xpipe/app/terminal/WindowsTerminalSession.java
index 9659be7f3..dc66d536b 100644
--- a/app/src/main/java/io/xpipe/app/terminal/WindowsTerminalSession.java
+++ b/app/src/main/java/io/xpipe/app/terminal/WindowsTerminalSession.java
@@ -80,7 +80,7 @@ public final class WindowsTerminalSession extends ControllableTerminalSession {
     }
 
     public void updateBoundsState() {
-        if (!control.isIconified() || !control.isVisible()) {
+        if (control.isIconified() || !control.isVisible()) {
             return;
         }
 
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 6e1fac3a8..06c01d8d0 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
@@ -76,7 +76,7 @@
 }
 
 .browser .terminal-dock-comp {
-    -fx-padding: 7 0 7 7;
+    -fx-padding: 7 0 7 0;
 }
 
 .selected-file-list {
diff --git a/dist/changelogs/13.0.md b/dist/changelogs/13.0.md
index a9a6b9aa5..e67ef8bdf 100644
--- a/dist/changelogs/13.0.md
+++ b/dist/changelogs/13.0.md
@@ -8,7 +8,7 @@
 ## File browser
 
 - There is now a new option in the context menu of a tab to pin it, allowing for having a split view with two different file systems
-- There is now the option to dock terminals in the file browser (this is only available on Windows for now)
+- There is now the option to dock terminals in the file browser (this is only available on Windows for now). You can disable this in Settings -> File browser -> Terminal docking if you don't like it
 - The previous system history tab is now always shown
 - You can now change the default download location for the move to downloads button
 
diff --git a/version b/version
index 60f31743e..51369fd5f 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-13.0-17
+13.0-18