beenull/xpipe-mirror
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-11-22 07:30:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Various fixes

Browse source
This commit is contained in:
crschnick 2024-07-13 13:09:43 +00:00
parent a59a2275f3
commit 47bfbcbce5
5 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/io/xpipe/app/browser/BrowserBookmarkHeaderComp.java
View file

@ -2,6 +2,7 @@ package io.xpipe.app.browser;
import io.xpipe.app.comp.store.StoreCategoryWrapper; import io.xpipe.app.comp.store.StoreCategoryWrapper;
import io.xpipe.app.comp.store.StoreViewState; import io.xpipe.app.comp.store.StoreViewState;
import io.xpipe.app.core.AppFont;
import io.xpipe.app.fxcomps.SimpleComp; import io.xpipe.app.fxcomps.SimpleComp;
import io.xpipe.app.fxcomps.impl.FilterComp; import io.xpipe.app.fxcomps.impl.FilterComp;
import io.xpipe.app.fxcomps.impl.HorizontalComp; import io.xpipe.app.fxcomps.impl.HorizontalComp;
@ -30,8 +31,13 @@ public final class BrowserBookmarkHeaderComp extends SimpleComp {
StoreViewState.get().getAllConnectionsCategory(), StoreViewState.get().getAllConnectionsCategory(),
StoreViewState.get().getActiveCategory(), StoreViewState.get().getActiveCategory(),
this.category) this.category)
.styleClass(Styles.LEFT_PILL); .styleClass(Styles.LEFT_PILL)
var filter = new FilterComp(this.filter).styleClass(Styles.RIGHT_PILL).minWidth(0).hgrow(); .apply(struc -> {
AppFont.medium(struc.get());
});
var filter = new FilterComp(this.filter).styleClass(Styles.RIGHT_PILL).minWidth(0).hgrow().apply(struc -> {
AppFont.medium(struc.get());
});
var top = new HorizontalComp(List.of(category, filter)) var top = new HorizontalComp(List.of(category, filter))
.apply(struc -> struc.get().setFillHeight(true)) .apply(struc -> struc.get().setFillHeight(true))

2
app/src/main/java/io/xpipe/app/browser/fs/OpenFileSystemComp.java
View file

@ -9,6 +9,7 @@ import io.xpipe.app.browser.file.BrowserContextMenu;
import io.xpipe.app.browser.file.BrowserFileListComp; import io.xpipe.app.browser.file.BrowserFileListComp;
import io.xpipe.app.comp.base.ModalOverlayComp; import io.xpipe.app.comp.base.ModalOverlayComp;
import io.xpipe.app.comp.base.MultiContentComp; import io.xpipe.app.comp.base.MultiContentComp;
import io.xpipe.app.core.AppFont;
import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.fxcomps.Comp;
import io.xpipe.app.fxcomps.SimpleComp; import io.xpipe.app.fxcomps.SimpleComp;
import io.xpipe.app.fxcomps.SimpleCompStructure; import io.xpipe.app.fxcomps.SimpleCompStructure;
@ -88,6 +89,7 @@ public class OpenFileSystemComp extends SimpleComp {
topBar.setAlignment(Pos.CENTER); topBar.setAlignment(Pos.CENTER);
topBar.getStyleClass().add("top-bar"); topBar.getStyleClass().add("top-bar");
var navBar = new BrowserNavBar(model).createStructure(); var navBar = new BrowserNavBar(model).createStructure();
AppFont.medium(navBar.get());
topBar.getChildren() topBar.getChildren()
.setAll( .setAll(
overview, overview,

16
app/src/main/java/io/xpipe/app/browser/session/BrowserSessionTabsComp.java
View file

@ -30,6 +30,7 @@ import javafx.scene.layout.Region;
import javafx.scene.layout.StackPane; import javafx.scene.layout.StackPane;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map; import java.util.Map;
import java.util.UUID; import java.util.UUID;
@ -48,17 +49,18 @@ public class BrowserSessionTabsComp extends SimpleComp {
} }
public Region createSimple() { public Region createSimple() {
var multi = new MultiContentComp(Map.<Comp<?>, ObservableValue<Boolean>>of( var map = new LinkedHashMap<Comp<?>, ObservableValue<Boolean>>();
Comp.of(() -> createTabPane()), map.put(Comp.hspacer().styleClass("top-spacer"),
Bindings.isNotEmpty(model.getSessionEntries()), new SimpleBooleanProperty(true));
new BrowserWelcomeComp(model).apply(struc -> StackPane.setAlignment(struc.get(), Pos.CENTER_LEFT)), map.put(Comp.of(() -> createTabPane()),
Bindings.isNotEmpty(model.getSessionEntries()));
map.put(new BrowserWelcomeComp(model).apply(struc -> StackPane.setAlignment(struc.get(), Pos.CENTER_LEFT)),
Bindings.createBooleanBinding( Bindings.createBooleanBinding(
() -> { () -> {
return model.getSessionEntries().size() == 0; return model.getSessionEntries().size() == 0;
}, },
model.getSessionEntries()), model.getSessionEntries()));
Comp.hspacer().styleClass("top-spacer"), var multi = new MultiContentComp(map);
new SimpleBooleanProperty(true)));
multi.apply(struc -> ((StackPane) struc.get()).setAlignment(Pos.TOP_CENTER)); multi.apply(struc -> ((StackPane) struc.get()).setAlignment(Pos.TOP_CENTER));
return multi.createRegion(); return multi.createRegion();
} }

2
app/src/main/resources/io/xpipe/app/resources/style/bookmark.css
View file

@ -36,5 +36,5 @@
-fx-min-height: 3.5em; -fx-min-height: 3.5em;
-fx-pref-height: 3.5em; -fx-pref-height: 3.5em;
-fx-max-height: 3.5em; -fx-max-height: 3.5em;
-fx-padding: 9 6 9 8; -fx-padding: 10 6 10 8;
} }

2
app/src/main/resources/io/xpipe/app/resources/style/browser.css
View file

@ -166,7 +166,7 @@
} }
.browser .path-text, .browser .browser-filter .text-field { .browser .path-text, .browser .browser-filter .text-field {
-fx-padding: 6 12; -fx-padding: 5 12;
} }
.browser .path-text:invisible { .browser .path-text:invisible {