mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-19 19:21:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename to onBeforeOpenMenu and init local reference in showTrayIcon()

Browse Source
This commit is contained in:
Edward Chow
2022-11-01 22:14:29 +11:00
parent 445be3b668
commit dc310c009f
3 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/org/cryptomator/ui/traymenu/AwtTrayMenuController.java
View File

@@ -30,6 +30,7 @@ public class AwtTrayMenuController implements TrayMenuController {
private static final Logger LOG = LoggerFactory.getLogger(AwtTrayMenuController.class);
private final PopupMenu menu = new PopupMenu();
private TrayIcon trayIcon;
@CheckAvailability
public static boolean isAvailable() {
@@ -39,7 +40,7 @@ public class AwtTrayMenuController implements TrayMenuController {
@Override
public void showTrayIcon(byte[] rawImageData, Runnable defaultAction, String tooltip) throws TrayMenuException {
var image = Toolkit.getDefaultToolkit().createImage(rawImageData);
var trayIcon = new TrayIcon(image, tooltip, menu);
trayIcon = new TrayIcon(image, tooltip, menu);
trayIcon.setImageAutoSize(true);
if (SystemUtils.IS_OS_WINDOWS) {
@@ -62,15 +63,18 @@ public class AwtTrayMenuController implements TrayMenuController {
@Override
public void onBeforeShow(Runnable listener) {
SystemTray systemTray = SystemTray.getSystemTray();
TrayIcon trayIcon = systemTray.getTrayIcons()[0];
trayIcon.addMouseListener(new MouseAdapter() {
@Override
public void mouseClicked(MouseEvent e) {
listener.run();
}
});
public void onBeforeOpenMenu(Runnable listener) {
try {
this.trayIcon.addMouseListener(new MouseAdapter() {
@Override
public void mouseClicked(MouseEvent e) {
listener.run();
}
});
} catch (Exception e) {
throw new IllegalStateException("Tray icon not found.", e);
}
}
private void addChildren(Menu menu, List<TrayMenuItem> items) {

2
src/main/java/org/cryptomator/ui/traymenu/TrayMenuBuilder.java
View File

@@ -68,7 +68,7 @@ public class TrayMenuBuilder {
try (var image = getClass().getResourceAsStream(SystemUtils.IS_OS_MAC_OSX ? TRAY_ICON_MAC : TRAY_ICON)) {
trayMenu.showTrayIcon(image.readAllBytes(), this::showMainWindow, "Cryptomator");
trayMenu.onBeforeShow(() -> {
trayMenu.onBeforeOpenMenu(() -> {
for (Vault vault : vaults) {
VaultListManager.redetermineVaultState(vault);
}