CodeMirror/xpipe
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-09-30 00:56:56 +13:00
Code Issues Projects Releases Packages Wiki Activity

Fix tray state becoming inconsistent

Browse source
This commit is contained in:
crschnick 2023-08-08 05:46:07 +00:00
parent 3d32d6cd84
commit 908b960977
3 changed files with 38 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/io/xpipe/app/core/AppMainWindow.java
View file

@ -50,6 +50,10 @@ public class AppMainWindow {
return INSTANCE;
}
public static AppMainWindow getInstance() {
return INSTANCE;
}
private synchronized void onChange() {
lastUpdate = Instant.now();
if (thread == null) {

26
app/src/main/java/io/xpipe/app/core/AppTray.java
View file

@ -5,7 +5,9 @@ import io.xpipe.app.core.mode.OperationMode;
import io.xpipe.app.issue.ErrorEvent;
import io.xpipe.app.issue.ErrorHandler;
import javafx.application.Platform;
import lombok.SneakyThrows;
import javax.swing.*;
import java.awt.*;
import java.time.Duration;
import java.time.Instant;
@ -15,11 +17,13 @@ public class AppTray {
private static AppTray INSTANCE;
private final FXTrayIcon icon;
private final ErrorHandler errorHandler;
private final TrayIcon privateTrayIcon;
@SneakyThrows
private AppTray() {
var url = AppResources.getResourceURL(AppResources.XPIPE_MODULE, "img/logo/logo_48x48.png");
var url = AppResources.getResourceURL(AppResources.XPIPE_MODULE, "img/logo/logo_48x48.png").orElseThrow();
var builder = new FXTrayIcon.Builder(App.getApp().getStage(), url.orElse(null))
var builder = new FXTrayIcon.Builder(App.getApp().getStage(), url)
.menuItem(AppI18n.get("open"), e -> {
OperationMode.switchToAsync(OperationMode.GUI);
});
@ -44,6 +48,11 @@ public class AppTray {
.toolTip("XPipe")
.build();
this.errorHandler = new TrayErrorHandler();
var tray = SystemTray.getSystemTray();
var f = icon.getClass().getDeclaredField("trayIcon");
f.setAccessible(true);
privateTrayIcon = (TrayIcon) f.get(this.icon);
}
public static void init() {
@ -56,17 +65,22 @@ public class AppTray {
public void show() {
icon.show();
// Remove functionality to show stage when primary clicked and replace it with our own
SwingUtilities.invokeLater(() -> {
privateTrayIcon.removeActionListener(privateTrayIcon.getActionListeners()[0]);
privateTrayIcon.addActionListener(e -> {
OperationMode.switchToAsync(OperationMode.GUI);
});
});
}
public void hide() {
// Ugly fix to prevent platform exit in icon.hide()
try {
var tray = SystemTray.getSystemTray();
var f = icon.getClass().getDeclaredField("trayIcon");
f.setAccessible(true);
var ti = (TrayIcon) f.get(this.icon);
EventQueue.invokeLater(() -> {
tray.remove(ti);
tray.remove(privateTrayIcon);
});
} catch (Exception ex) {
ErrorEvent.fromThrowable(ex).handle();

22
app/src/main/java/io/xpipe/app/core/mode/GuiMode.java
View file

@ -2,6 +2,7 @@ package io.xpipe.app.core.mode;
import io.xpipe.app.core.App;
import io.xpipe.app.core.AppGreetings;
import io.xpipe.app.core.AppMainWindow;
import io.xpipe.app.issue.*;
import io.xpipe.app.update.UpdateChangelogAlert;
import io.xpipe.app.util.PlatformState;
@ -22,15 +23,20 @@ public class GuiMode extends PlatformMode {
super.platformSetup();
CountDownLatch latch = new CountDownLatch(1);
Platform.runLater(() -> {
try {
TrackEvent.info("mode", "Setting up window ...");
UnlockAlert.showIfNeeded();
App.getApp().setupWindow();
AppGreetings.showIfNeeded();
UpdateChangelogAlert.showIfNeeded();
if (AppMainWindow.getInstance() == null) {
try {
TrackEvent.info("mode", "Setting up window ...");
UnlockAlert.showIfNeeded();
App.getApp().setupWindow();
AppGreetings.showIfNeeded();
UpdateChangelogAlert.showIfNeeded();
latch.countDown();
} catch (Throwable t) {
ErrorEvent.fromThrowable(t).terminal(true).handle();
}
} else {
AppMainWindow.getInstance().show();
latch.countDown();
} catch (Throwable t) {
ErrorEvent.fromThrowable(t).terminal(true).handle();
}
});