beenull/xpipe-mirror
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-09-19 22:01:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Style fixes

Browse source
This commit is contained in:
crschnick 2024-07-04 14:39:19 +00:00
parent 2df431ae79
commit 9b5f9dd4f9
1 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
app/src/main/java/io/xpipe/app/comp/base/SideMenuBarComp.java
View file

@ -8,6 +8,7 @@ import io.xpipe.app.fxcomps.CompStructure;
import io.xpipe.app.fxcomps.SimpleCompStructure; import io.xpipe.app.fxcomps.SimpleCompStructure;
import io.xpipe.app.fxcomps.augment.Augment; import io.xpipe.app.fxcomps.augment.Augment;
import io.xpipe.app.fxcomps.impl.IconButtonComp; import io.xpipe.app.fxcomps.impl.IconButtonComp;
import io.xpipe.app.fxcomps.impl.StackComp;
import io.xpipe.app.fxcomps.impl.TooltipAugment; import io.xpipe.app.fxcomps.impl.TooltipAugment;
import io.xpipe.app.fxcomps.util.PlatformThread; import io.xpipe.app.fxcomps.util.PlatformThread;
import io.xpipe.app.update.UpdateAvailableAlert; import io.xpipe.app.update.UpdateAvailableAlert;
@ -18,6 +19,8 @@ import javafx.application.Platform;
import javafx.beans.binding.Bindings; import javafx.beans.binding.Bindings;
import javafx.beans.property.Property; import javafx.beans.property.Property;
import javafx.css.PseudoClass; import javafx.css.PseudoClass;
import javafx.geometry.Insets;
import javafx.geometry.Pos;
import javafx.scene.control.Button; import javafx.scene.control.Button;
import javafx.scene.layout.*; import javafx.scene.layout.*;
import javafx.scene.paint.Color; import javafx.scene.paint.Color;
@ -41,27 +44,21 @@ public class SideMenuBarComp extends Comp<CompStructure<VBox>> {
var selectedBorder = Bindings.createObjectBinding( var selectedBorder = Bindings.createObjectBinding(
() -> { () -> {
var c = Platform.getPreferences().getAccentColor(); var c = Platform.getPreferences().getAccentColor().desaturate();
return new Border(new BorderStroke( return new Background(new BackgroundFill(c,new CornerRadii(8), new Insets(5, 1, 5, 2)));
c, BorderStrokeStyle.SOLID, CornerRadii.EMPTY, new BorderWidths(0, 3, 0, 0)));
}, },
Platform.getPreferences().accentColorProperty()); Platform.getPreferences().accentColorProperty());
var hoverBorder = Bindings.createObjectBinding( var hoverBorder = Bindings.createObjectBinding(
() -> { () -> {
var c = Platform.getPreferences().getAccentColor().darker(); var c = Platform.getPreferences().getAccentColor().darker().desaturate();
return new Border(new BorderStroke( return new Background(new BackgroundFill(c,new CornerRadii(8), new Insets(5, 1, 5, 2)));
c, BorderStrokeStyle.SOLID, CornerRadii.EMPTY, new BorderWidths(0, 3, 0, 0)));
}, },
Platform.getPreferences().accentColorProperty()); Platform.getPreferences().accentColorProperty());
var noneBorder = Bindings.createObjectBinding( var noneBorder = Bindings.createObjectBinding(
() -> { () -> {
return new Border(new BorderStroke( return Background.fill(Color.TRANSPARENT);
Color.TRANSPARENT,
BorderStrokeStyle.SOLID,
CornerRadii.EMPTY,
new BorderWidths(0, 3, 0, 0)));
}, },
Platform.getPreferences().accentColorProperty()); Platform.getPreferences().accentColorProperty());
@ -82,8 +79,16 @@ public class SideMenuBarComp extends Comp<CompStructure<VBox>> {
struc.get().pseudoClassStateChanged(selected, n.equals(e)); struc.get().pseudoClassStateChanged(selected, n.equals(e));
}); });
}); });
struc.get() });
.borderProperty() b.accessibleText(e.name());
var indicator = Comp.empty().styleClass("indicator");
var stack = new StackComp(List.of(indicator, b)).apply(struc -> struc.get().setAlignment(Pos.CENTER_RIGHT));
stack.apply(struc -> {
var indicatorRegion = (Region) struc.get().getChildren().get(0);
indicatorRegion.setMaxWidth(7);
indicatorRegion
.backgroundProperty()
.bind(Bindings.createObjectBinding( .bind(Bindings.createObjectBinding(
() -> { () -> {
if (value.getValue().equals(e)) { if (value.getValue().equals(e)) {
@ -102,13 +107,12 @@ public class SideMenuBarComp extends Comp<CompStructure<VBox>> {
selectedBorder, selectedBorder,
noneBorder)); noneBorder));
}); });
b.accessibleText(e.name()); vbox.getChildren().add(stack.createRegion());
vbox.getChildren().add(b.createRegion());
} }
Augment<CompStructure<Button>> simpleBorders = struc -> { Augment<CompStructure<Button>> simpleBorders = struc -> {
struc.get() struc.get()
.borderProperty() .backgroundProperty()
.bind(Bindings.createObjectBinding( .bind(Bindings.createObjectBinding(
() -> { () -> {
if (struc.get().isHover()) { if (struc.get().isHover()) {