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

macos dock fixes

Browse source
This commit is contained in:
crschnick 2024-02-20 03:40:22 +00:00
parent f5846611d1
commit 629e8e1dec
3 changed files with 31 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/src/main/java/io/xpipe/app/core/App.java
View file

@ -2,7 +2,6 @@ package io.xpipe.app.core;
import io.xpipe.app.Main;
import io.xpipe.app.comp.AppLayoutComp;
import io.xpipe.app.core.mode.OperationMode;
import io.xpipe.app.fxcomps.util.PlatformThread;
import io.xpipe.app.issue.ErrorEvent;
import io.xpipe.app.issue.TrackEvent;
@ -17,9 +16,6 @@ import lombok.SneakyThrows;
import javax.imageio.ImageIO;
import java.awt.*;
import java.awt.desktop.AppReopenedEvent;
import java.awt.desktop.AppReopenedListener;
import java.awt.desktop.SystemEventListener;
@Getter
public class App extends Application {
@ -57,17 +53,6 @@ public class App extends Application {
Desktop.getDesktop().setPreferencesHandler(e -> {
AppLayoutModel.get().selectSettings();
});
// Do it this way to prevent IDE inspections from complaining
var c = Class.forName(ModuleLayer.boot().findModule("java.desktop").orElseThrow(),
"com.apple.eawt.Application");
var m = c.getDeclaredMethod("addAppEventListener", SystemEventListener.class);
m.invoke(c.getMethod("getApplication").invoke(null), new AppReopenedListener() {
@Override
public void appReopened(AppReopenedEvent e) {
OperationMode.switchToAsync(OperationMode.GUI);
}
});
}
if (OsType.getLocal().equals(OsType.LINUX)) {

32
app/src/main/java/io/xpipe/app/core/mode/OperationMode.java
View file

@ -6,16 +6,22 @@ import io.xpipe.app.core.check.AppUserDirectoryCheck;
import io.xpipe.app.ext.DataStoreProviders;
import io.xpipe.app.issue.*;
import io.xpipe.app.launcher.LauncherCommand;
import io.xpipe.app.launcher.LauncherInput;
import io.xpipe.app.util.LocalShell;
import io.xpipe.app.util.PlatformState;
import io.xpipe.app.util.ThreadHelper;
import io.xpipe.app.util.XPipeSession;
import io.xpipe.core.process.OsType;
import io.xpipe.core.util.FailableRunnable;
import io.xpipe.core.util.XPipeDaemonMode;
import io.xpipe.core.util.XPipeInstallation;
import javafx.application.Platform;
import lombok.Getter;
import java.awt.*;
import java.awt.desktop.AppReopenedEvent;
import java.awt.desktop.AppReopenedListener;
import java.awt.desktop.SystemEventListener;
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Pattern;
@ -119,7 +125,31 @@ public abstract class OperationMode {
}
public static void postInit(String[] args) {
DataStoreProviders.postInit(AppExtensionManager.getInstance().getExtendedLayer());
try {
// This will initialize the toolkit on macos and create the dock icon
// macOS it does not like applications that run fully in the background, so do it always
if (OsType.getLocal().equals(OsType.MACOS)) {
// URL open operations have to be handled in a special way on macOS!
Desktop.getDesktop().setOpenURIHandler(e -> {
LauncherInput.handle(List.of(e.getURI().toString()));
});
// Do it this way to prevent IDE inspections from complaining
var c = Class.forName(ModuleLayer.boot().findModule("java.desktop").orElseThrow(),
"com.apple.eawt.Application");
var m = c.getDeclaredMethod("addAppEventListener", SystemEventListener.class);
m.invoke(c.getMethod("getApplication").invoke(null), new AppReopenedListener() {
@Override
public void appReopened(AppReopenedEvent e) {
OperationMode.switchToAsync(OperationMode.GUI);
}
});
}
DataStoreProviders.postInit(AppExtensionManager.getInstance().getExtendedLayer());
} catch (Throwable ex) {
ErrorEvent.fromThrowable(ex).term().handle();
}
}
public static void switchToAsync(OperationMode newMode) {

8
app/src/main/java/io/xpipe/app/launcher/LauncherCommand.java
View file

@ -139,14 +139,6 @@ public class LauncherCommand implements Callable<Integer> {
}
LauncherInput.handle(inputs);
// URL open operations have to be handled in a special way on macOS!
if (OsType.getLocal().equals(OsType.MACOS)) {
Desktop.getDesktop().setOpenURIHandler(e -> {
LauncherInput.handle(List.of(e.getURI().toString()));
});
}
return 0;
}
}