mirror of
https://github.com/xpipe-io/xpipe.git
synced 2024-09-19 13:51:23 +00:00
Style fixes
This commit is contained in:
parent
64f58d37a4
commit
0632875c7d
|
@ -95,8 +95,8 @@ public class StoreEntryListOverviewComp extends SimpleComp {
|
||||||
createDateSortButton().createRegion(),
|
createDateSortButton().createRegion(),
|
||||||
Comp.hspacer(2).createRegion(),
|
Comp.hspacer(2).createRegion(),
|
||||||
createAlphabeticalSortButton().createRegion());
|
createAlphabeticalSortButton().createRegion());
|
||||||
AppFont.setSize(label, 3);
|
AppFont.setSize(label, 2);
|
||||||
AppFont.setSize(c, 3);
|
AppFont.setSize(c, 2);
|
||||||
topBar.setAlignment(Pos.CENTER);
|
topBar.setAlignment(Pos.CENTER);
|
||||||
topBar.getStyleClass().add("top");
|
topBar.getStyleClass().add("top");
|
||||||
return topBar;
|
return topBar;
|
||||||
|
@ -111,9 +111,11 @@ public class StoreEntryListOverviewComp extends SimpleComp {
|
||||||
});
|
});
|
||||||
var filter = new FilterComp(StoreViewState.get().getFilterString());
|
var filter = new FilterComp(StoreViewState.get().getFilterString());
|
||||||
var f = filter.createRegion();
|
var f = filter.createRegion();
|
||||||
var buttons = createAddButton();
|
var button = createAddButton();
|
||||||
var hbox = new HBox(buttons, f);
|
var hbox = new HBox(button, f);
|
||||||
f.prefHeightProperty().bind(buttons.heightProperty());
|
f.minHeightProperty().bind(button.heightProperty());
|
||||||
|
f.prefHeightProperty().bind(button.heightProperty());
|
||||||
|
f.maxHeightProperty().bind(button.heightProperty());
|
||||||
hbox.setSpacing(8);
|
hbox.setSpacing(8);
|
||||||
hbox.setAlignment(Pos.CENTER);
|
hbox.setAlignment(Pos.CENTER);
|
||||||
HBox.setHgrow(f, Priority.ALWAYS);
|
HBox.setHgrow(f, Priority.ALWAYS);
|
||||||
|
@ -136,7 +138,7 @@ public class StoreEntryListOverviewComp extends SimpleComp {
|
||||||
if (OsType.getLocal().equals(OsType.MACOS)) {
|
if (OsType.getLocal().equals(OsType.MACOS)) {
|
||||||
menu.setPadding(new Insets(-2, 0, -2, 0));
|
menu.setPadding(new Insets(-2, 0, -2, 0));
|
||||||
} else {
|
} else {
|
||||||
menu.setPadding(new Insets(-3, 0, -3, 0));
|
menu.setPadding(new Insets(-4, 0, -4, 0));
|
||||||
}
|
}
|
||||||
|
|
||||||
return menu;
|
return menu;
|
||||||
|
@ -164,6 +166,7 @@ public class StoreEntryListOverviewComp extends SimpleComp {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
alphabetical.apply(alphabeticalR -> {
|
alphabetical.apply(alphabeticalR -> {
|
||||||
|
AppFont.medium(alphabeticalR.get());
|
||||||
alphabeticalR
|
alphabeticalR
|
||||||
.get()
|
.get()
|
||||||
.opacityProperty()
|
.opacityProperty()
|
||||||
|
@ -204,6 +207,7 @@ public class StoreEntryListOverviewComp extends SimpleComp {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
date.apply(dateR -> {
|
date.apply(dateR -> {
|
||||||
|
AppFont.medium(dateR.get());
|
||||||
dateR.get()
|
dateR.get()
|
||||||
.opacityProperty()
|
.opacityProperty()
|
||||||
.bind(Bindings.createDoubleBinding(
|
.bind(Bindings.createDoubleBinding(
|
||||||
|
|
|
@ -55,7 +55,9 @@ public class ModifiedStage extends Stage {
|
||||||
return;
|
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("seamless-frame"), false);
|
||||||
stage.getScene().getRoot().pseudoClassStateChanged(PseudoClass.getPseudoClass("separate-frame"), true);
|
stage.getScene().getRoot().pseudoClassStateChanged(PseudoClass.getPseudoClass("separate-frame"), true);
|
||||||
return;
|
return;
|
||||||
|
@ -67,7 +69,7 @@ public class ModifiedStage extends Stage {
|
||||||
case OsType.MacOs macOs -> {
|
case OsType.MacOs macOs -> {
|
||||||
var ctrl = new NativeMacOsWindowControl(stage);
|
var ctrl = new NativeMacOsWindowControl(stage);
|
||||||
var seamlessFrame = !AppPrefs.get().performanceMode().get() && mergeFrame();
|
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("seamless-frame"), seamlessFrameApplied);
|
||||||
stage.getScene().getRoot().pseudoClassStateChanged(PseudoClass.getPseudoClass("separate-frame"), !seamlessFrameApplied);
|
stage.getScene().getRoot().pseudoClassStateChanged(PseudoClass.getPseudoClass("separate-frame"), !seamlessFrameApplied);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +0,0 @@
|
||||||
.filter-comp {
|
|
||||||
-fx-padding: 0.15em 0.3em 0.15em 0.7em;
|
|
||||||
-fx-background-color: transparent;
|
|
||||||
}
|
|
|
@ -30,7 +30,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.sidebar-comp .icon-button-comp {
|
.sidebar-comp .icon-button-comp {
|
||||||
-fx-padding: 1em;
|
-fx-padding: 1.1em;
|
||||||
}
|
}
|
||||||
|
|
||||||
.sidebar-comp .icon-button-comp .vbox {
|
.sidebar-comp .icon-button-comp .vbox {
|
||||||
|
|
Loading…
Reference in a new issue