There can be more than Notion and Miro. AFFiNE(pronounced [ə‘fain]) is a next-gen knowledge base that brings planning, sorting and creating all together. Privacy first, open-source, customizable and ready to use.
TypeScript appcrdteditorelectronknowledge-basemarkdownmironotesnotionnotion-alternativerustrust-langrust-languagetabletableviewwhiteboardwikiworkspace
fix(electron): tray menu icon adapt to dark theme (#11288)
pengx178bea31698ed8
diff --git a/packages/frontend/apps/electron-renderer/src/popup/recording/index.tsx b/packages/frontend/apps/electron-renderer/src/popup/recording/index.tsxindex c04b18b3d3..d593232676 100644--- a/packages/frontend/apps/electron-renderer/src/popup/recording/index.tsx+++ b/packages/frontend/apps/electron-renderer/src/popup/recording/index.tsx@@ -94,6 +94,7 @@ export function Recording() {let id: number | undefined;try {const result = await apis?.recording?.getCurrentRecording();+if (!result) {return;}diff --git a/packages/frontend/apps/electron/src/main/recording/feature.ts b/packages/frontend/apps/electron/src/main/recording/feature.tsindex 6f53c9f658..810c502c1a 100644--- a/packages/frontend/apps/electron/src/main/recording/feature.ts+++ b/packages/frontend/apps/electron/src/main/recording/feature.ts@@ -471,11 +471,11 @@ export function setupRecordingFeature() {shareableContent = new ShareableContent();setupMediaListeners();}+ // reset all states+ recordingStatus$.next(null);setupAppGroups();setupNewRunningAppGroup();setupRecordingListeners();- // reset all states- recordingStatus$.next(null);return true;} catch (error) {logger.error('failed to setup recording feature', error);@@ -499,10 +499,6 @@ function normalizeAppGroupInfo(export function newRecording(appGroup?: AppGroupInfo | number): RecordingStatus | null {- if (!shareableContent) {- return null; // likely called on unsupported platform- }-return recordingStateMachine.dispatch({type: 'NEW_RECORDING',appGroup: normalizeAppGroupInfo(appGroup),diff --git a/packages/frontend/apps/electron/src/main/tray/index.ts b/packages/frontend/apps/electron/src/main/tray/index.tsindex 8ec1acc09d..8160d4c89b 100644--- a/packages/frontend/apps/electron/src/main/tray/index.ts+++ b/packages/frontend/apps/electron/src/main/tray/index.ts@@ -64,6 +64,10 @@ function buildMenuConfig(config: TrayMenuConfig): MenuItemConstructorOptions[] {}if (nativeIcon) {nativeIcon = nativeIcon.resize({ width: 20, height: 20 });+ // string icon should be template image+ if (typeof icon === 'string') {+ nativeIcon.setTemplateImage(true);+ }}const submenuConfig = submenu ? buildMenuConfig(submenu) : undefined;menuConfig.push({diff --git a/packages/frontend/core/src/modules/feature-flag/constant.ts b/packages/frontend/core/src/modules/feature-flag/constant.tsindex d6a787e9b1..46168fd171 100644--- a/packages/frontend/core/src/modules/feature-flag/constant.ts+++ b/packages/frontend/core/src/modules/feature-flag/constant.ts@@ -280,7 +280,7 @@ export const AFFINE_FLAGS = {'com.affine.settings.workspace.experimental-features.enable-meetings.name',description:'com.affine.settings.workspace.experimental-features.enable-meetings.description',- configurable: !isMobile && environment.isMacOs,+ configurable: !isMobile && environment.isMacOs && BUILD_CONFIG.isElectron,defaultState: false,},} satisfies { [key in string]: FlagInfo };