Skip to content

Commit 18702dc

Browse files
authored
Merge pull request #65 from SGudbrandsson/linux-taskbar
Enabled tray icon in Linux and added dark mode support for visibility
2 parents 4282c1d + d2f7bd8 commit 18702dc

11 files changed

+70
-43
lines changed

electron-builder.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ dmg:
4040
linux:
4141
artifactName: ${name}-${arch}.${ext}
4242
icon: build/icon.icns
43+
executableName: solidtime
4344
target:
4445
- target: deb
4546
arch:
@@ -54,10 +55,10 @@ linux:
5455
arch:
5556
- x64
5657
- arm64
57-
desktop: # Define desktop elem
58-
name: solidtime
59-
exec: solidtime %U
60-
MimeType: x-scheme-handler/solidtime
58+
desktop:
59+
entry:
60+
Name: solidtime
61+
MimeType: x-scheme-handler/solidtime
6162
maintainer: solidtime.io
6263
category: Utility
6364
mimeTypes:

resources/icon_inverted.png

9.01 KB
Loading

resources/linux_icon_inverted.png

7.08 KB
Loading
1.24 KB
Loading
1.36 KB
Loading

resources/solidtime_inverted.png

34.4 KB
Loading

resources/solidtime_inverted.svg

Lines changed: 12 additions & 0 deletions
Loading
897 Bytes
Loading

src/main/index.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,8 @@ function createWindow(): void {
4242
const miniWindow = initializeMiniWindow(icon)
4343
registerMiniWindowListeners(miniWindow)
4444

45-
if (process.platform !== 'linux') {
46-
const tray = initializeTray(mainWindow)
47-
registerTrayListeners(tray, mainWindow)
48-
}
45+
const tray = initializeTray(mainWindow)
46+
registerTrayListeners(tray, mainWindow)
4947

5048
// HMR for renderer base on electron-vite cli.
5149
// Load the remote URL for development or the local html file for production.

src/main/mainWindow.ts

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,9 @@ export function initializeMainWindow(icon: string) {
2626

2727
let forcequit = false
2828
mainWindow.on('close', (event) => {
29-
if (process.platform === 'darwin') {
30-
if (forcequit === false) {
31-
event.preventDefault()
32-
mainWindow.hide()
33-
}
34-
} else {
35-
app.quit()
29+
if (forcequit === false) {
30+
event.preventDefault()
31+
mainWindow.hide()
3632
}
3733
})
3834
app.on('before-quit', () => {

0 commit comments

Comments
 (0)