From af422e4f6364741a6f0c5a5f2d23135ce4faa7d6 Mon Sep 17 00:00:00 2001 From: Digimezzo Date: Fri, 29 Dec 2023 09:17:56 +0100 Subject: [PATCH] Better default for tray icon color --- CHANGELOG.md | 4 +++- main.js | 20 ++++++++++++-------- main.js.map | 2 +- main.ts | 20 +++++++++++--------- 4 files changed, 27 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c7430a9e..cc08c3fd7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [3.0.0-preview.22] - 2023-12-28 +## [3.0.0-preview.22] - 2023-12-29 ### Added @@ -13,6 +13,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed +- More subtle page switching animation +- Smarter default colors for tray icon - Updated Bulgarian translation - Updated Vietnamese translation diff --git a/main.js b/main.js index 14a1680e5..4721dec92 100644 --- a/main.js +++ b/main.js @@ -75,19 +75,23 @@ function getTrayIcon() { return path.join(globalAny.__static, 'icons/trayTemplate.png'); } const invertColor = settings.get('invertNotificationAreaIconColor'); - if (electron_1.nativeTheme.shouldUseDarkColors) { - if (invertColor) { - return path.join(globalAny.__static, os.platform() === 'win32' ? 'icons/tray_black.ico' : 'icons/tray_black.png'); + if (os.platform() === 'win32') { + if (!invertColor) { + // Defaulting to black for Windows + return path.join(globalAny.__static, 'icons/tray_black.ico'); } else { - return path.join(globalAny.__static, os.platform() === 'win32' ? 'icons/tray_white.ico' : 'icons/tray_white.png'); + return path.join(globalAny.__static, 'icons/tray_white.ico'); } } - if (invertColor) { - return path.join(globalAny.__static, os.platform() === 'win32' ? 'icons/tray_white.ico' : 'icons/tray_white.png'); - } else { - return path.join(globalAny.__static, os.platform() === 'win32' ? 'icons/tray_black.ico' : 'icons/tray_black.png'); + if (!invertColor) { + // Defaulting to white for Linux + return path.join(globalAny.__static, 'icons/tray_white.png'); + } + else { + return path.join(globalAny.__static, 'icons/tray_black.png'); + } } } function createMainWindow() { diff --git a/main.js.map b/main.js.map index 427758192..0de65b5ce 100644 --- a/main.js.map +++ b/main.js.map @@ -1 +1 @@ -{"version":3,"file":"main.js","sourceRoot":"","sources":["main.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"main.js","sourceRoot":"","sources":["main.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/main.ts b/main.ts index f6b80abd8..b786ecc32 100644 --- a/main.ts +++ b/main.ts @@ -88,18 +88,20 @@ function getTrayIcon(): string { const invertColor: boolean = settings.get('invertNotificationAreaIconColor'); - if (nativeTheme.shouldUseDarkColors) { - if (invertColor) { - return path.join(globalAny.__static, os.platform() === 'win32' ? 'icons/tray_black.ico' : 'icons/tray_black.png'); + if (os.platform() === 'win32') { + if (!invertColor) { + // Defaulting to black for Windows + return path.join(globalAny.__static, 'icons/tray_black.ico'); } else { - return path.join(globalAny.__static, os.platform() === 'win32' ? 'icons/tray_white.ico' : 'icons/tray_white.png'); + return path.join(globalAny.__static, 'icons/tray_white.ico'); } - } - - if (invertColor) { - return path.join(globalAny.__static, os.platform() === 'win32' ? 'icons/tray_white.ico' : 'icons/tray_white.png'); } else { - return path.join(globalAny.__static, os.platform() === 'win32' ? 'icons/tray_black.ico' : 'icons/tray_black.png'); + if (!invertColor) { + // Defaulting to white for Linux + return path.join(globalAny.__static, 'icons/tray_white.png'); + } else { + return path.join(globalAny.__static, 'icons/tray_black.png'); + } } }