Skip to content

Commit fe75125

Browse files
committed
Remove the "Hide dock icon" menu item for Windows. #596
1 parent da1e639 commit fe75125

File tree

2 files changed

+19
-17
lines changed

2 files changed

+19
-17
lines changed

src/main/main.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ const createWindow = async () => {
5757

5858
let hide_dock_icon = await configGet('hide_dock_icon')
5959
if (hide_dock_icon) {
60-
app.dock.hide()
60+
app.dock && app.dock.hide()
6161
} else {
62-
app.dock.show()
62+
app.dock && app.dock.show()
6363
.catch(e => console.error(e))
6464
}
6565

src/main/ui/tray/index.ts

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { makeWindow } from '@main/ui/tray/window'
1010
import events from '@root/common/events'
1111
import { I18N } from '@root/common/i18n'
1212
import version from '@root/version.json'
13-
import { app, BrowserWindow, Menu, screen, Tray } from 'electron'
13+
import { app, BrowserWindow, Menu, MenuItemConstructorOptions, screen, Tray } from 'electron'
1414
import * as path from 'path'
1515

1616
let tray: Tray
@@ -69,21 +69,23 @@ const makeTray = async () => {
6969
label: `v${ver}`,
7070
enabled: false,
7171
},
72-
{ type: 'separator' },
73-
{
74-
label: lang.toggle_dock_icon,
75-
async click () {
76-
let hide_dock_icon = await configGet('hide_dock_icon')
77-
hide_dock_icon = !hide_dock_icon
78-
await configSet('hide_dock_icon', hide_dock_icon)
79-
if (hide_dock_icon) {
80-
app.dock.hide()
81-
} else {
82-
app.dock.show()
83-
.catch(e => console.error(e))
84-
}
72+
...(app.dock ? <MenuItemConstructorOptions[]>[
73+
{ type: 'separator' },
74+
{
75+
label: lang.toggle_dock_icon,
76+
async click () {
77+
let hide_dock_icon = await configGet('hide_dock_icon')
78+
hide_dock_icon = !hide_dock_icon
79+
await configSet('hide_dock_icon', hide_dock_icon)
80+
if (hide_dock_icon) {
81+
app.dock.hide()
82+
} else {
83+
app.dock.show()
84+
.catch(e => console.error(e))
85+
}
86+
},
8587
},
86-
},
88+
] : []),
8789
{ type: 'separator' },
8890
{
8991
label: lang.quit,

0 commit comments

Comments
 (0)