lee/xpipe
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2026-05-04 03:40:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rework

Browse Source
This commit is contained in:
crschnick
2026-03-14 17:44:41 +00:00
parent 0f2fe547a9
commit 3bb30745d0
7 changed files with 9 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/xpipe/app/browser/file/BrowserFileSystemTabComp.java
+1 -1
View File
@@ -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) {
app/src/main/java/io/xpipe/app/browser/file/BrowserHistoryTabComp.java
+1 -1
View File
@@ -63,7 +63,7 @@ public class BrowserHistoryTabComp extends SimpleRegionBuilder {
var map = new LinkedHashMap<BaseRegionBuilder<?, ?>, ObservableValue<Boolean>>();
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();
}
app/src/main/java/io/xpipe/app/comp/base/AppLayoutComp.java
+1 -1
View File
@@ -47,7 +47,7 @@ public class AppLayoutComp extends RegionStructureBuilder<BorderPane, AppLayoutC
model.getSelected()),
(v1, v2) -> v2,
LinkedHashMap::new));
var multi = new MultiContentComp(true, map, true);
var multi = new MultiContentComp(true, map);
multi.style("background");
var pane = new BorderPane();
app/src/main/java/io/xpipe/app/comp/base/MultiContentComp.java
+1 -35
View File
@@ -18,13 +18,11 @@ import java.util.Map;
public class MultiContentComp extends SimpleRegionBuilder {
private final boolean requestFocus;
private final boolean log;
private final Map<BaseRegionBuilder<?, ?>, ObservableValue<Boolean>> content;
public MultiContentComp(
boolean requestFocus, Map<BaseRegionBuilder<?, ?>, ObservableValue<Boolean>> content, boolean log) {
boolean requestFocus, Map<BaseRegionBuilder<?, ?>, ObservableValue<Boolean>> content) {
this.requestFocus = requestFocus;
this.log = log;
this.content = FXCollections.observableMap(content);
}
@@ -53,14 +51,7 @@ public class MultiContentComp extends SimpleRegionBuilder {
});
for (Map.Entry<BaseRegionBuilder<?, ?>, ObservableValue<Boolean>> 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<BaseRegionBuilder<?,?>, ObservableValue<Boolean>> 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;
// }
}
app/src/main/java/io/xpipe/app/hub/comp/StoreCategoryIconComp.java
+1 -1
View File
@@ -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));
app/src/main/java/io/xpipe/app/hub/comp/StoreEntryListComp.java
+1 -1
View File
@@ -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();
}
}
app/src/main/java/io/xpipe/app/hub/comp/StoreFilterStateComp.java
+3 -3
View File
@@ -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)