diff --git a/app/src/main/java/io/xpipe/app/browser/file/BrowserFileSystemTabComp.java b/app/src/main/java/io/xpipe/app/browser/file/BrowserFileSystemTabComp.java index e775993b6..5de16c805 100644 --- a/app/src/main/java/io/xpipe/app/browser/file/BrowserFileSystemTabComp.java +++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserFileSystemTabComp.java @@ -207,7 +207,7 @@ public class BrowserFileSystemTabComp extends SimpleComp { home, model.getCurrentPath().isNull(), fileList, - model.getCurrentPath().isNull().not())); + model.getCurrentPath().isNull().not()), false); var r = stack.styleClass("browser-content-container").createRegion(); r.focusedProperty().addListener((observable, oldValue, newValue) -> { if (newValue) { diff --git a/app/src/main/java/io/xpipe/app/browser/file/BrowserHistoryTabComp.java b/app/src/main/java/io/xpipe/app/browser/file/BrowserHistoryTabComp.java index 6bd6d78e7..8cb8479b1 100644 --- a/app/src/main/java/io/xpipe/app/browser/file/BrowserHistoryTabComp.java +++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserHistoryTabComp.java @@ -60,7 +60,7 @@ public class BrowserHistoryTabComp extends SimpleComp { var map = new LinkedHashMap, ObservableValue>(); map.put(emptyDisplay, empty); map.put(contentDisplay, empty.not()); - var stack = new MultiContentComp(map); + var stack = new MultiContentComp(map, false); return stack.createRegion(); } diff --git a/app/src/main/java/io/xpipe/app/comp/base/AppLayoutComp.java b/app/src/main/java/io/xpipe/app/comp/base/AppLayoutComp.java index d1cc17984..beed3c3fd 100644 --- a/app/src/main/java/io/xpipe/app/comp/base/AppLayoutComp.java +++ b/app/src/main/java/io/xpipe/app/comp/base/AppLayoutComp.java @@ -39,7 +39,7 @@ public class AppLayoutComp extends Comp { return model.getSelected().getValue().equals(entry); }, model.getSelected()))); - var multi = new MultiContentComp(map); + var multi = new MultiContentComp(map, true); multi.styleClass("background"); var pane = new BorderPane(); diff --git a/app/src/main/java/io/xpipe/app/comp/base/MultiContentComp.java b/app/src/main/java/io/xpipe/app/comp/base/MultiContentComp.java index 3abad3960..599a18a1d 100644 --- a/app/src/main/java/io/xpipe/app/comp/base/MultiContentComp.java +++ b/app/src/main/java/io/xpipe/app/comp/base/MultiContentComp.java @@ -2,6 +2,7 @@ package io.xpipe.app.comp.base; import io.xpipe.app.comp.Comp; import io.xpipe.app.comp.SimpleComp; +import io.xpipe.app.issue.TrackEvent; import io.xpipe.app.util.PlatformThread; import javafx.beans.value.ObservableValue; @@ -15,9 +16,11 @@ import java.util.Map; public class MultiContentComp extends SimpleComp { + private final boolean log; private final Map, ObservableValue> content; - public MultiContentComp(Map, ObservableValue> content) { + public MultiContentComp(Map, ObservableValue> content, boolean log) { + this.log = log; this.content = FXCollections.observableMap(content); } @@ -34,7 +37,14 @@ public class MultiContentComp extends SimpleComp { }); for (Map.Entry, ObservableValue> e : content.entrySet()) { + var name = e.getKey().getClass().getSimpleName(); + if (log) { + TrackEvent.trace("Creating content tab region for element " + name); + } var r = e.getKey().createRegion(); + if (log) { + TrackEvent.trace("Created content tab region for element " + name); + } e.getValue().subscribe(val -> { PlatformThread.runLaterIfNeeded(() -> { r.setManaged(val); @@ -42,6 +52,9 @@ public class MultiContentComp extends SimpleComp { }); }); m.put(e.getKey(), r); + if (log) { + TrackEvent.trace("Added content tab region for element " + name); + } } return stack; diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreEntryListComp.java b/app/src/main/java/io/xpipe/app/comp/store/StoreEntryListComp.java index 96576bf01..06c3fbb74 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreEntryListComp.java +++ b/app/src/main/java/io/xpipe/app/comp/store/StoreEntryListComp.java @@ -142,6 +142,6 @@ public class StoreEntryListComp extends SimpleComp { map.put(new StoreScriptsIntroComp(scriptsIntroShowing), showScriptsIntro); map.put(new StoreIdentitiesIntroComp(), showIdentitiesIntro); - return new MultiContentComp(map).createRegion(); + return new MultiContentComp(map, false).createRegion(); } } diff --git a/version b/version index 644a261e2..968b25c01 100644 --- a/version +++ b/version @@ -1 +1 @@ -15.6-4 +15.6-5