pepepper/fluxer
1
0 Fork 0
mirror of https://github.com/fluxerapp/fluxer synced 2026-10-17 21:15:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

feat(desktop): bundled renderer, modules and instance accounts (#3254)

Browse Source
This commit is contained in:
Hampus authored and GitHub committed 2026-10-07 16:48:07 +02:00
1 parent c748c8af4e
commit 7c5fa2180a
1275 files changed
+215074 -81246
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

fluxer_desktop/src/main/DesktopTray.ts
+15 -8
View File
@@ -2,9 +2,9 @@
import fs from 'node:fs';
import path from 'node:path';
import {fileURLToPath} from 'node:url';
import {BUILD_CHANNEL} from '@electron/common/BuildChannel';
import {BUILD_CHANNEL, type BuildChannel} from '@electron/common/BuildChannel';
import {getDesktopWindowBehaviorSettings} from '@electron/common/DesktopConfig';
import {DESKTOP_APP_NAME} from '@electron/common/DesktopIdentity';
import {createChildLogger} from '@electron/common/Logger';
import type {
TrayPresenceStatus as SharedTrayPresenceStatus,
@@ -15,12 +15,20 @@ import {relaunchStableLaunchPath} from '@electron/main/LinuxLaunchPath';
import {onLocaleChange, t} from '@electron/main/MainI18n';
import {app, type BrowserWindow, clipboard, Menu, nativeImage, Tray} from 'electron';
const __dirname = path.dirname(fileURLToPath(import.meta.url));
const logger = createChildLogger('DesktopTray');
const isCanary = BUILD_CHANNEL === 'canary';
const APP_NAME = isCanary ? 'Fluxer Canary' : 'Fluxer';
const ICON_DIR_NAME = isCanary ? 'icons-canary' : 'icons-stable';
const TRAY_POSITION_GUID = isCanary ? '1a39981b-b4cc-46a4-8f7e-9fce187110f5' : '11c70c9f-a35d-4328-9040-f722dc5fa0a0';
const ICON_DIR_NAMES: Record<BuildChannel, string> = {
stable: 'icons-stable',
canary: 'icons-canary',
development: 'icons-development',
};
const TRAY_POSITION_GUIDS: Record<BuildChannel, string> = {
stable: '11c70c9f-a35d-4328-9040-f722dc5fa0a0',
canary: '1a39981b-b4cc-46a4-8f7e-9fce187110f5',
development: 'd0070fe2-067b-419c-af26-6fd197700d63',
};
const APP_NAME = DESKTOP_APP_NAME;
const ICON_DIR_NAME = ICON_DIR_NAMES[BUILD_CHANNEL];
const TRAY_POSITION_GUID = TRAY_POSITION_GUIDS[BUILD_CHANNEL];
interface DesktopTrayController {
createWindow: () => BrowserWindow;
@@ -162,7 +170,6 @@ function getCandidateIconDirs(): Array<string> {
path.join(process.resourcesPath, ICON_DIR_NAME),
process.resourcesPath,
path.join(app.getAppPath(), 'build_resources', ICON_DIR_NAME),
path.resolve(__dirname, '../../build_resources', ICON_DIR_NAME),
path.resolve(process.cwd(), 'build_resources', ICON_DIR_NAME),
path.resolve(process.cwd(), 'fluxer_desktop', 'build_resources', ICON_DIR_NAME),
path.dirname(app.getPath('exe')),