Small fixes

app/src/main/java/io/xpipe/app/browser/session/BrowserChooserComp.java

@@ -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);

app/src/main/java/io/xpipe/app/comp/store/StoreSection.java

@@ -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(
+        var comp = explicitOrderComp;
-                value -> value.getWrapper().getEntry().getValidity().isUsable() ? -1 : 1);
-        var comp = explicitOrderComp.thenComparing(usableComp);
         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())
+                        return current.comparator().compare(current.representative(o1), current.representative(o2));
-                                .compare(current.representative(o1), current.representative(o2));
                     } else {
-                        return comp.compare(o1, o2);
+                        return 0;
                     }
                 },
                 mappedSortMode,

app/src/main/java/io/xpipe/app/comp/store/StoreSectionMiniComp.java

@@ -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),

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

@@ -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;
 }
 

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

@@ -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;
 }