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

Style fixes

Browse source
This commit is contained in:
crschnick 2024-07-18 15:10:32 +00:00
parent 64f58d37a4
commit 0632875c7d
4 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/src/main/java/io/xpipe/app/comp/store/StoreEntryListOverviewComp.java
View file

@ -95,8 +95,8 @@ public class StoreEntryListOverviewComp extends SimpleComp {
createDateSortButton().createRegion(),
Comp.hspacer(2).createRegion(),
createAlphabeticalSortButton().createRegion());
AppFont.setSize(label, 3);
AppFont.setSize(c, 3);
AppFont.setSize(label, 2);
AppFont.setSize(c, 2);
topBar.setAlignment(Pos.CENTER);
topBar.getStyleClass().add("top");
return topBar;
@ -111,9 +111,11 @@ public class StoreEntryListOverviewComp extends SimpleComp {
});
var filter = new FilterComp(StoreViewState.get().getFilterString());
var f = filter.createRegion();
var buttons = createAddButton();
var hbox = new HBox(buttons, f);
f.prefHeightProperty().bind(buttons.heightProperty());
var button = createAddButton();
var hbox = new HBox(button, f);
f.minHeightProperty().bind(button.heightProperty());
f.prefHeightProperty().bind(button.heightProperty());
f.maxHeightProperty().bind(button.heightProperty());
hbox.setSpacing(8);
hbox.setAlignment(Pos.CENTER);
HBox.setHgrow(f, Priority.ALWAYS);
@ -136,7 +138,7 @@ public class StoreEntryListOverviewComp extends SimpleComp {
if (OsType.getLocal().equals(OsType.MACOS)) {
menu.setPadding(new Insets(-2, 0, -2, 0));
} else {
menu.setPadding(new Insets(-3, 0, -3, 0));
menu.setPadding(new Insets(-4, 0, -4, 0));
}
return menu;
@ -164,6 +166,7 @@ public class StoreEntryListOverviewComp extends SimpleComp {
}
});
alphabetical.apply(alphabeticalR -> {
AppFont.medium(alphabeticalR.get());
alphabeticalR
.get()
.opacityProperty()
@ -204,6 +207,7 @@ public class StoreEntryListOverviewComp extends SimpleComp {
}
});
date.apply(dateR -> {
AppFont.medium(dateR.get());
dateR.get()
.opacityProperty()
.bind(Bindings.createDoubleBinding(

6
app/src/main/java/io/xpipe/app/core/window/ModifiedStage.java
View file

@ -55,7 +55,9 @@ public class ModifiedStage extends Stage {
return;
}
if (OsType.getLocal() == OsType.LINUX || AppPrefs.get() == null || AppPrefs.get().theme.getValue() == null) {
var applyToStage = (OsType.getLocal() == OsType.WINDOWS) ||
(OsType.getLocal() == OsType.MACOS && AppMainWindow.getInstance() != null && AppMainWindow.getInstance().getStage() == stage);
if (!applyToStage || AppPrefs.get() == null || AppPrefs.get().theme.getValue() == null) {
stage.getScene().getRoot().pseudoClassStateChanged(PseudoClass.getPseudoClass("seamless-frame"), false);
stage.getScene().getRoot().pseudoClassStateChanged(PseudoClass.getPseudoClass("separate-frame"), true);
return;
@ -67,7 +69,7 @@ public class ModifiedStage extends Stage {
case OsType.MacOs macOs -> {
var ctrl = new NativeMacOsWindowControl(stage);
var seamlessFrame = !AppPrefs.get().performanceMode().get() && mergeFrame();
var seamlessFrameApplied = seamlessFrame && ctrl.setAppearance(seamlessFrame, AppPrefs.get().theme.getValue().isDark());
var seamlessFrameApplied = ctrl.setAppearance(seamlessFrame, AppPrefs.get().theme.getValue().isDark()) && seamlessFrame;
stage.getScene().getRoot().pseudoClassStateChanged(PseudoClass.getPseudoClass("seamless-frame"), seamlessFrameApplied);
stage.getScene().getRoot().pseudoClassStateChanged(PseudoClass.getPseudoClass("separate-frame"), !seamlessFrameApplied);
}

4
app/src/main/resources/io/xpipe/app/resources/style/filter-comp.css
View file

@ -1,4 +0,0 @@
.filter-comp {
-fx-padding: 0.15em 0.3em 0.15em 0.7em;
-fx-background-color: transparent;
}

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

@ -30,7 +30,7 @@
}
.sidebar-comp .icon-button-comp {
-fx-padding: 1em;
-fx-padding: 1.1em;
}
.sidebar-comp .icon-button-comp .vbox {