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 f35b24858..b6819fbae 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 @@ -241,7 +241,7 @@ public class BrowserFileSystemTabComp extends SimpleRegionBuilder { }); var home = new BrowserOverviewComp(model).style("browser-overview"); - var stack = new MultiContentComp(false, Map.of(home, showOverview, fileList, showOverview.not()), false); + var stack = new MultiContentComp(false, Map.of(home, showOverview, fileList, showOverview.not())); var r = stack.style("browser-content-container").build(); 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 84c785a7c..244598a79 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 @@ -63,7 +63,7 @@ public class BrowserHistoryTabComp extends SimpleRegionBuilder { var map = new LinkedHashMap, ObservableValue>(); map.put(emptyDisplay, empty); map.put(contentDisplay, empty.not()); - var stack = new MultiContentComp(false, map, false); + var stack = new MultiContentComp(false, map); return stack.build(); } 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 24ded7573..4b46ef291 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 @@ -47,7 +47,7 @@ public class AppLayoutComp extends RegionStructureBuilder v2, LinkedHashMap::new)); - var multi = new MultiContentComp(true, map, true); + var multi = new MultiContentComp(true, map); multi.style("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 46e12985d..5a231d408 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 @@ -18,13 +18,11 @@ import java.util.Map; public class MultiContentComp extends SimpleRegionBuilder { private final boolean requestFocus; - private final boolean log; private final Map, ObservableValue> content; public MultiContentComp( - boolean requestFocus, Map, ObservableValue> content, boolean log) { + boolean requestFocus, Map, ObservableValue> content) { this.requestFocus = requestFocus; - this.log = log; this.content = FXCollections.observableMap(content); } @@ -53,14 +51,7 @@ public class MultiContentComp extends SimpleRegionBuilder { }); 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().build(); - if (log) { - TrackEvent.trace("Created content tab region for element " + name); - } e.getValue().subscribe(val -> { PlatformThread.runLaterIfNeeded(() -> { r.setManaged(val); @@ -73,33 +64,8 @@ public class MultiContentComp extends SimpleRegionBuilder { }); }); m.put(e.getKey(), r); - if (log) { - TrackEvent.trace("Added content tab region for element " + name); - } } return stack; } - - // Lazy impl - // @Override - // protected Region createSimple() { - // var stack = new StackPane(); - // for (Map.Entry, ObservableValue> e : content.entrySet()) { - // var r = e.getKey().build(); - // e.getValue().subscribe(val -> { - // PlatformThread.runLaterIfNeeded(() -> { - // r.setManaged(val); - // r.setVisible(val); - // if (val && !stack.getChildren().contains(r)) { - // stack.getChildren().add(r); - // } else { - // stack.getChildren().remove(r); - // } - // }); - // }); - // } - // - // return stack; - // } } diff --git a/app/src/main/java/io/xpipe/app/hub/comp/StoreCategoryIconComp.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreCategoryIconComp.java index 7a05a776f..aa6f01f0e 100644 --- a/app/src/main/java/io/xpipe/app/hub/comp/StoreCategoryIconComp.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreCategoryIconComp.java @@ -22,7 +22,7 @@ public class StoreCategoryIconComp extends SimpleRegionBuilder { protected Region createSimple() { var imageComp = PrettyImageHelper.ofFixedSize(wrapper.getIconFile(), size, size); var storeIcon = imageComp.build(); - storeIcon.setPadding(new Insets(0, 0, 1.5, 0)); + storeIcon.setPadding(new Insets(0, 0, 1, 0)); var dots = new FontIcon("mdi2d-dots-horizontal"); dots.setIconSize((int) (size * 1.1)); diff --git a/app/src/main/java/io/xpipe/app/hub/comp/StoreEntryListComp.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreEntryListComp.java index 8a56be25e..008d06723 100644 --- a/app/src/main/java/io/xpipe/app/hub/comp/StoreEntryListComp.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreEntryListComp.java @@ -181,6 +181,6 @@ public class StoreEntryListComp extends SimpleRegionBuilder { map.put(new StoreScriptSourcesIntroComp(), showScriptSourcesIntro); map.put(new StoreIdentitiesIntroComp(), showIdentitiesIntro); - return new MultiContentComp(false, map, false).build(); + return new MultiContentComp(false, map).build(); } } diff --git a/app/src/main/java/io/xpipe/app/hub/comp/StoreFilterStateComp.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreFilterStateComp.java index 75589cd33..e0663ccc6 100644 --- a/app/src/main/java/io/xpipe/app/hub/comp/StoreFilterStateComp.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreFilterStateComp.java @@ -59,13 +59,13 @@ public class StoreFilterStateComp extends SimpleRegionBuilder { .hide(searchesEmpty) .addComp(searchesList) .hide(searchesEmpty) - .addComp(new LabelComp(AppI18n.observable("recentSearchesDescription"))) - .addComp(searchesEmptyList) - .addComp(RegionBuilder.hseparator()) .addComp(new LabelComp(AppI18n.observable("recentQuickConnections"))) .hide(quickConnectionsEmpty) .addComp(quickConnectionsList) .hide(quickConnectionsEmpty) + .addComp(RegionBuilder.hseparator()) + .addComp(new LabelComp(AppI18n.observable("recentSearchesDescription"))) + .addComp(searchesEmptyList) .addComp(new LabelComp(AppI18n.observable("recentQuickConnectionsDescription"))) .addComp(quickConnectionsEmptyList)