mirror/xpipe
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2026-04-22 23:49:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
crschnick
2025-02-02 08:07:14 +00:00
parent b8b9f5655f
commit 0ed90ccbb6
7 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/io/xpipe/app/browser/file/BrowserNavBarComp.java
View File

@@ -9,6 +9,7 @@ import io.xpipe.app.comp.base.PrettyImageHelper;
import io.xpipe.app.comp.base.TextFieldComp;
import io.xpipe.app.comp.base.TooltipAugment;
import io.xpipe.app.util.BooleanScope;
import io.xpipe.app.util.ContextMenuHelper;
import io.xpipe.app.util.ThreadHelper;
import javafx.application.Platform;
@@ -172,7 +173,7 @@ public class BrowserNavBarComp extends Comp<BrowserNavBarComp.Structure> {
}
private ContextMenu createContextMenu() {
var cm = new ContextMenu();
var cm = ContextMenuHelper.create();
var f = model.getHistory().getForwardHistory(8).stream().toList();
for (int i = f.size() - 1; i >= 0; i--) {

2
app/src/main/java/io/xpipe/app/comp/base/AppMainWindowContentComp.java
View File

@@ -58,7 +58,7 @@ public class AppMainWindowContentComp extends SimpleComp {
var version = new LabelComp((AppProperties.get().isStaging() ? "XPipe PTB" : "XPipe") + " "
+ AppProperties.get().getVersion());
version.apply(struc -> {
AppFontSizes.lg(struc.get());
AppFontSizes.xl(struc.get());
struc.get().setOpacity(0.6);
});

6
app/src/main/java/io/xpipe/app/comp/base/DropdownComp.java
View File

@@ -5,6 +5,7 @@ import io.xpipe.app.comp.CompStructure;
import io.xpipe.app.comp.SimpleCompStructure;
import io.xpipe.app.comp.augment.ContextMenuAugment;
import io.xpipe.app.util.ContextMenuHelper;
import javafx.beans.binding.Bindings;
import javafx.beans.value.ObservableValue;
import javafx.css.Size;
@@ -27,11 +28,12 @@ public class DropdownComp extends Comp<CompStructure<Button>> {
@Override
public CompStructure<Button> createBase() {
ContextMenu cm = new ContextMenu(items.stream()
var cm = ContextMenuHelper.create();
cm.getItems().setAll(items.stream()
.map(comp -> {
return new MenuItem(null, comp.createRegion());
})
.toArray(MenuItem[]::new));
.toList());
Button button = (Button) new ButtonComp(null, () -> {})
.apply(new ContextMenuAugment<>(e -> true, null, () -> {

2
app/src/main/java/io/xpipe/app/comp/store/DenseStoreEntryComp.java
View File

@@ -76,7 +76,7 @@ public class DenseStoreEntryComp extends StoreEntryComp {
if (showIcon) {
var storeIcon = createIcon(28, 24);
grid.getColumnConstraints().add(new ColumnConstraints(38));
grid.getColumnConstraints().add(new ColumnConstraints(34));
grid.add(storeIcon, 0, 0);
GridPane.setHalignment(storeIcon, HPos.CENTER);
}

2
app/src/main/java/io/xpipe/app/comp/store/StandardStoreEntryComp.java
View File

@@ -41,7 +41,7 @@ public class StandardStoreEntryComp extends StoreEntryComp {
var storeIcon = createIcon(46, 40);
grid.add(storeIcon, 0, 0, 1, 2);
grid.getColumnConstraints().add(new ColumnConstraints(56));
grid.getColumnConstraints().add(new ColumnConstraints(52));
var active = new StoreActiveComp(getWrapper()).createRegion();
var nameBox = new HBox(name, userIcon, notes);

9
app/src/main/java/io/xpipe/app/comp/store/StoreEntryComp.java
View File

@@ -19,6 +19,7 @@ import io.xpipe.app.storage.DataStoreEntry;
import io.xpipe.app.update.XPipeDistributionType;
import io.xpipe.app.util.*;
import io.xpipe.core.process.OsType;
import javafx.beans.binding.Bindings;
import javafx.beans.value.ObservableDoubleValue;
import javafx.css.PseudoClass;
@@ -135,7 +136,11 @@ public abstract class StoreEntryComp extends SimpleComp {
var loading = LoadingOverlayComp.noProgress(
Comp.of(() -> button), getWrapper().getEffectiveBusy());
AppFontSizes.base(button);
if (OsType.getLocal() == OsType.MACOS) {
AppFontSizes.sm(button);
} else {
AppFontSizes.base(button);
}
return loading.createRegion();
}
@@ -263,7 +268,7 @@ public abstract class StoreEntryComp extends SimpleComp {
}
protected ContextMenu createContextMenu() {
var contextMenu = new ContextMenu();
var contextMenu = ContextMenuHelper.create();
AppFontSizes.sm(contextMenu.getStyleableNode());
var hasSep = false;

7
app/src/main/java/io/xpipe/app/util/ContextMenuHelper.java
View File

@@ -3,6 +3,7 @@ package io.xpipe.app.util;
import io.xpipe.app.core.AppFontSizes;
import io.xpipe.app.core.AppI18n;
import io.xpipe.core.process.OsType;
import javafx.application.Platform;
import javafx.geometry.Side;
import javafx.scene.Node;
@@ -34,7 +35,11 @@ public class ContextMenuHelper {
}
});
});
AppFontSizes.sm(contextMenu.getStyleableNode());
if (OsType.getLocal() == OsType.MACOS) {
AppFontSizes.base(contextMenu.getStyleableNode());
} else {
AppFontSizes.sm(contextMenu.getStyleableNode());
}
return contextMenu;
}