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

Small fixes

Browse source
This commit is contained in:
crschnick 2024-06-21 01:07:48 +00:00
parent 33302fb75d
commit 5e90f169b1
5 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/io/xpipe/app/browser/session/BrowserChooserComp.java
View file

@ -115,6 +115,7 @@ public class BrowserChooserComp extends SimpleComp {
var splitPane = new SideSplitPaneComp(bookmarksList, stack)
.withInitialWidth(AppLayoutModel.get().getSavedState().getBrowserConnectionsWidth())
.withOnDividerChange(AppLayoutModel.get().getSavedState()::setBrowserConnectionsWidth)
.styleClass("background")
.apply(struc -> {
struc.getLeft().setMinWidth(200);
struc.getLeft().setMaxWidth(500);

18
app/src/main/java/io/xpipe/app/comp/store/StoreSection.java
View file

@ -71,6 +71,10 @@ public class StoreSection {
var explicitOrderComp = Comparator.<StoreSection>comparingInt(new ToIntFunction<>() {
@Override
public int applyAsInt(StoreSection value) {
if (!value.getWrapper().getEntry().getValidity().isUsable()) {
return 1;
}
var explicit = value.getWrapper().getEntry().getExplicitOrder();
if (explicit == null) {
return 0;
@ -82,20 +86,22 @@ public class StoreSection {
};
}
});
var usableComp = Comparator.<StoreSection>comparingInt(
value -> value.getWrapper().getEntry().getValidity().isUsable() ? -1 : 1);
var comp = explicitOrderComp.thenComparing(usableComp);
var comp = explicitOrderComp;
var mappedSortMode = BindingsHelper.flatMap(
category,
storeCategoryWrapper -> storeCategoryWrapper != null ? storeCategoryWrapper.getSortMode() : null);
return list.sorted(
(o1, o2) -> {
var r = comp.compare(o1, o2);
if (r != 0) {
return r;
}
var current = mappedSortMode.getValue();
if (current != null) {
return comp.thenComparing(current.comparator())
.compare(current.representative(o1), current.representative(o2));
return current.comparator().compare(current.representative(o1), current.representative(o2));
} else {
return comp.compare(o1, o2);
return 0;
}
},
mappedSortMode,

2
app/src/main/java/io/xpipe/app/comp/store/StoreSectionMiniComp.java
View file

@ -145,7 +145,7 @@ public class StoreSectionMiniComp extends Comp<CompStructure<VBox>> {
.hgrow();
list.add(new HorizontalComp(List.of(content))
.styleClass("content")
.styleClass("children-content")
.apply(struc -> struc.get().setFillHeight(true))
.hide(Bindings.or(
Bindings.not(expanded),

10
app/src/main/resources/io/xpipe/app/resources/style/store-mini-section.css
View file

@ -1,4 +1,4 @@
.store-mini-list-comp > * > * > .content {
.store-mini-list-comp > * > * > .children-content {
-fx-spacing: 0.5em;
}
@ -65,15 +65,15 @@
-fx-border-insets: 0px;
}
.store-section-mini-comp > .content {
.store-section-mini-comp > .children-content {
-fx-padding: 5px 0 5px 15px;
}
.store-section-mini-comp:root > .content {
.store-section-mini-comp:root > .children-content {
-fx-padding: 0.5em 1em 0.5em 1em;
}
.store-section-mini-comp.condensed:root > .content {
.store-section-mini-comp.condensed:root > .children-content {
-fx-padding: 0;
}
@ -118,7 +118,7 @@
-fx-border-color: -color-border-default;
}
.store-section-mini-comp .list-box-view-comp .content {
.store-section-mini-comp .list-box-view-comp .children-content {
-fx-spacing: 0.4em;
}

2
app/src/main/resources/io/xpipe/app/resources/style/toggle-switch-comp.css
View file

@ -1,3 +1,3 @@
.toggle-switch-comp:hover > .thumb-area, .root:key-navigation .toggle-switch-comp:focused > .thumb-area {
-fx-background-color: -color-neutral-muted;
-fx-background-color: -color-neutral-emphasis;
}