hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Fix conflicts after rebase

Browse Source 
Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com>

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>
This commit is contained in:
Janne Savolainen 2022-05-11 08:30:39 +03:00
parent 90e7677f36
commit 33cef4c9ef
No known key found for this signature in database
GPG Key ID: 8C6CFB2FFFE8F68A
3 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/tray/tray-icon-path.injectable.ts Normal file
View File

@ -0,0 +1,26 @@
/**
* Copyright (c) OpenLens Authors. All rights reserved.
* Licensed under MIT License. See LICENSE in root directory for more information.
*/
import { getInjectable } from "@ogre-tools/injectable";
import getAbsolutePathInjectable from "../../common/path/get-absolute-path.injectable";
import staticFilesDirectoryInjectable from "../../common/vars/static-files-directory.injectable";
import isDevelopmentInjectable from "../../common/vars/is-development.injectable";
const trayIconPathInjectable = getInjectable({
id: "tray-icon-path",
instantiate: (di) => {
const getAbsolutePath = di.inject(getAbsolutePathInjectable);
const staticFilesDirectory = di.inject(staticFilesDirectoryInjectable);
const isDevelopment = di.inject(isDevelopmentInjectable);
return getAbsolutePath(
staticFilesDirectory,
isDevelopment ? "../build/tray" : "icons", // copied within electron-builder extras
"trayIconTemplate.png",
);
},
});
export default trayIconPathInjectable;

3
src/main/tray/tray.injectable.ts
View File

@ -11,6 +11,7 @@ import { getStartableStoppable } from "../../common/utils/get-startable-stoppabl
import isAutoUpdateEnabledInjectable from "../is-auto-update-enabled.injectable";
import showAboutInjectable from "../menu/show-about.injectable";
import showApplicationWindowInjectable from "../start-main-application/lens-window/show-application-window.injectable";
import trayIconPathInjectable from "./tray-icon-path.injectable";
const trayInjectable = getInjectable({
id: "tray",
@ -22,6 +23,7 @@ const trayInjectable = getInjectable({
const isAutoUpdateEnabled = di.inject(isAutoUpdateEnabledInjectable);
const showApplicationWindow = di.inject(showApplicationWindowInjectable);
const showAboutPopup = di.inject(showAboutInjectable);
const trayIconPath = di.inject(trayIconPathInjectable);
return getStartableStoppable("build-of-tray", () =>
initTray(
@ -31,6 +33,7 @@ const trayInjectable = getInjectable({
isAutoUpdateEnabled,
showApplicationWindow,
showAboutPopup,
trayIconPath,
),
);
},

16
src/main/tray/tray.ts
View File

@ -9,25 +9,16 @@ import type { IComputedValue } from "mobx";
import { autorun } from "mobx";
import { checkForUpdates } from "../app-updater";
import logger from "../logger";
import { isDevelopment, isWindows, productName, staticFilesDirectory } from "../../common/vars";
import { isWindows, productName } from "../../common/vars";
import type { Disposer } from "../../common/utils";
import { disposer, toJS } from "../../common/utils";
import type { TrayMenuRegistration } from "./tray-menu-registration";
import path from "path";
const TRAY_LOG_PREFIX = "[TRAY]";
// note: instance of Tray should be saved somewhere, otherwise it disappears
export let tray: Tray;
function getTrayIconPath(): string {
return path.resolve(
staticFilesDirectory,
isDevelopment ? "../build/tray" : "icons", // copied within electron-builder extras
"trayIconTemplate.png",
);
}
export function initTray(
trayMenuItems: IComputedValue<TrayMenuRegistration[]>,
navigateToPreferences: () => void,
@ -35,10 +26,9 @@ export function initTray(
isAutoUpdateEnabled: () => boolean,
showApplicationWindow: () => Promise<void>,
showAbout: () => void,
trayIconPath: string,
): Disposer {
const icon = getTrayIconPath();
tray = new Tray(icon);
tray = new Tray(trayIconPath);
tray.setToolTip(packageInfo.description);
tray.setIgnoreDoubleClickEvents(true);