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

reverted 5dcdaf45

Browse Source
This commit is contained in:
Tobias Hagemann
2019-08-26 20:36:47 +02:00
parent f1b5ec6481
commit 8939b196c0
2 changed files with 14 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
main/ui/src/main/java/org/cryptomator/ui/traymenu/TrayIconController.java
View File

@@ -1,8 +1,6 @@
package org.cryptomator.ui.traymenu;
import javafx.beans.Observable;
import org.apache.commons.lang3.SystemUtils;
import org.cryptomator.common.settings.Settings;
import org.cryptomator.jni.JniException;
import org.cryptomator.jni.MacApplicationUiState;
import org.cryptomator.jni.MacFunctions;
@@ -20,15 +18,13 @@ public class TrayIconController {
private static final Logger LOG = LoggerFactory.getLogger(TrayIconController.class);
private final Settings settings;
private final TrayImageFactory imageFactory;
private final TrayMenuController trayMenuController;
private final TrayIcon trayIcon;
private final Optional<MacFunctions> macFunctions;
@Inject
TrayIconController(Settings settings, TrayImageFactory imageFactory, TrayMenuController trayMenuController, Optional<MacFunctions> macFunctions) {
this.settings = settings;
TrayIconController(TrayImageFactory imageFactory, TrayMenuController trayMenuController, Optional<MacFunctions> macFunctions) {
this.trayMenuController = trayMenuController;
this.imageFactory = imageFactory;
this.trayIcon = new TrayIcon(imageFactory.loadImage(), "Cryptomator", trayMenuController.getMenu());
@@ -36,8 +32,7 @@ public class TrayIconController {
}
public void initializeTrayIcon() {
// macFunctions.map(MacFunctions::uiAppearance).ifPresent(uiAppearance -> uiAppearance.addListener(this::macInterfaceThemeChanged));
settings.theme().addListener(this::themeChanged);
macFunctions.map(MacFunctions::uiAppearance).ifPresent(uiAppearance -> uiAppearance.addListener(this::macInterfaceThemeChanged));
if (SystemUtils.IS_OS_WINDOWS) {
// TODO: test on windows: is this a double click?
@@ -56,8 +51,7 @@ public class TrayIconController {
trayMenuController.initTrayMenu();
}
// public void macInterfaceThemeChanged() {
private void themeChanged(@SuppressWarnings("unused") Observable observable) {
public void macInterfaceThemeChanged() {
trayIcon.setImage(imageFactory.loadImage());
}

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

@@ -1,24 +1,23 @@
package org.cryptomator.ui.traymenu;
import org.apache.commons.lang3.SystemUtils;
import org.cryptomator.common.settings.Settings;
import org.cryptomator.jni.MacApplicationUiAppearance;
import org.cryptomator.jni.MacApplicationUiInterfaceStyle;
import org.cryptomator.jni.MacFunctions;
import javax.inject.Inject;
import java.awt.Image;
import java.awt.Toolkit;
import java.util.Optional;
@TrayMenuScoped
class TrayImageFactory {
// private final Optional<MacFunctions> macFunctions;
private final Settings settings;
private final Optional<MacFunctions> macFunctions;
@Inject
// TrayImageFactory(Optional<MacFunctions> macFunctions) {
// this.macFunctions = macFunctions;
TrayImageFactory(Settings settings) {
this.settings = settings;
TrayImageFactory(Optional<MacFunctions> macFunctions) {
this.macFunctions = macFunctions;
}
public Image loadImage() {
@@ -27,11 +26,10 @@ class TrayImageFactory {
}
private String getMacResourceName() {
// MacApplicationUiInterfaceStyle interfaceStyle = macFunctions.map(MacFunctions::uiAppearance) //
// .map(MacApplicationUiAppearance::getCurrentInterfaceStyle) //
// .orElse(MacApplicationUiInterfaceStyle.LIGHT);
// switch (interfaceStyle) {
switch (settings.theme().get()) {
MacApplicationUiInterfaceStyle interfaceStyle = macFunctions.map(MacFunctions::uiAppearance) //
.map(MacApplicationUiAppearance::getCurrentInterfaceStyle) //
.orElse(MacApplicationUiInterfaceStyle.LIGHT);
switch (interfaceStyle) {
case DARK:
return "/tray_icon_mac_white.png";
default: