lee/xpipe
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2026-05-03 11:20:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rework

Browse Source
This commit is contained in:
crschnick
2026-04-29 13:29:29 +00:00
parent 3938d4f6a4
commit 918faa067f
3 changed files with 34 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/xpipe/app/platform/NativeBridge.java
+15 -13
View File
@@ -9,6 +9,7 @@ import com.sun.jna.Library;
import com.sun.jna.Native;
import com.sun.jna.NativeLong;
import java.nio.file.Files;
import java.util.Map;
import java.util.Optional;
@@ -25,24 +26,25 @@ public class NativeBridge {
}
public static Optional<MacOsLibrary> getMacOsLibrary() {
if (!AppProperties.get().isImage()
|| !AppProperties.get().isFullVersion()
|| !AppProperties.get().getArch().equals("arm64")) {
if (!AppProperties.get().isFullVersion() || !AppProperties.get().getArch().equals("arm64")) {
return Optional.empty();
}
if (macOsLibrary == null && !loadingFailed) {
var base = AppProperties.get().isImage() ? AppInstallation.ofCurrent() : AppInstallation.ofDefault();
var file = base
.getBaseInstallationPath()
.resolve("Contents")
.resolve("runtime")
.resolve("Contents")
.resolve("Home")
.resolve("lib");
if (!Files.exists(file)) {
return Optional.empty();
}
try {
System.setProperty(
"jna.library.path",
AppInstallation.ofCurrent()
.getBaseInstallationPath()
.resolve("Contents")
.resolve("runtime")
.resolve("Contents")
.resolve("Home")
.resolve("lib")
.toString());
System.setProperty("jna.library.path", file.toString());
var l = Native.load("xpipe_bridge", MacOsLibrary.class, Map.of());
macOsLibrary = l;
} catch (Throwable t) {
app/src/main/java/io/xpipe/app/util/NativeMacOsWindowControl.java
+1 -1
View File
@@ -32,7 +32,7 @@ public class NativeMacOsWindowControl {
}
public boolean setAppearance(boolean seamlessFrame, boolean darkMode) {
if (!AppProperties.get().isImage() || !AppProperties.get().isFullVersion()) {
if (!AppProperties.get().isFullVersion()) {
return false;
}
app/src/main/java/io/xpipe/app/util/RemoteDesktopDockComp.java
+18 -16
View File
@@ -13,6 +13,7 @@ import io.xpipe.app.platform.PlatformThread;
import javafx.application.Platform;
import javafx.beans.binding.Bindings;
import javafx.beans.property.SimpleBooleanProperty;
import javafx.beans.value.ObservableBooleanValue;
import javafx.collections.ListChangeListener;
import javafx.css.PseudoClass;
import javafx.geometry.Pos;
@@ -79,7 +80,7 @@ public class RemoteDesktopDockComp extends SimpleRegionBuilder {
return vbox;
}
private void fillToolbar(Region content, ToolBar bar, List<? extends RemoteDesktopDockEntry> list) {
private void fillToolbar(ToolBar bar, List<? extends RemoteDesktopDockEntry> list, ObservableBooleanValue requiresRestart) {
var w = RemoteDesktopWindow.get();
bar.getItems().forEach(node -> node.getProperties().clear());
bar.getItems().clear();
@@ -129,7 +130,6 @@ public class RemoteDesktopDockComp extends SimpleRegionBuilder {
buttons.setSpacing(6);
bar.getItems().add(buttons);
var requiresRestart = new SimpleBooleanProperty();
var restartButton = new ButtonComp(AppI18n.observable("reloadSizes"), new LabelGraphic.IconGraphic("mdi2r-restart"), () -> {
w.getRestartTriggered().set(true);
GlobalTimer.delay(() -> {
@@ -146,18 +146,6 @@ public class RemoteDesktopDockComp extends SimpleRegionBuilder {
});
}
});
if (RemoteDesktopWindow.get().supportsDocking()) {
var ref = new WeakReference<>(content);
GlobalTimer.scheduleUntil(Duration.ofMillis(200), false, () -> {
if (ref.get() == null) {
return true;
}
var rect = w.getDockBounds();
requiresRestart.set(rect != null && w.getProcesses().stream().anyMatch(e -> e.requiresRestart(rect.getW(), rect.getH())));
return false;
});
}
restartButton.show(requiresRestart);
buttons.getChildren().add(restartButton.build());
}
@@ -178,10 +166,24 @@ public class RemoteDesktopDockComp extends SimpleRegionBuilder {
var w = RemoteDesktopWindow.get();
var bar = new ToolBar();
fillToolbar(content, bar, w.getProcesses());
var requiresRestart = new SimpleBooleanProperty();
if (RemoteDesktopWindow.get().supportsDocking()) {
var ref = new WeakReference<>(content);
GlobalTimer.scheduleUntil(Duration.ofMillis(200), false, () -> {
if (ref.get() == null) {
return true;
}
var rect = w.getDockBounds();
requiresRestart.set(rect != null && w.getProcesses().stream().anyMatch(e -> e.requiresRestart(rect.getW(), rect.getH())));
return false;
});
}
fillToolbar(bar, w.getProcesses(), requiresRestart);
w.getProcesses().addListener((ListChangeListener<? super RemoteDesktopDockEntry>) c -> {
PlatformThread.runLaterIfNeeded(() -> {
fillToolbar(content, bar, c.getList());
fillToolbar(bar, c.getList(), requiresRestart);
updateSelection(bar, w.getSelected().get());
});
});