Skip to content
This repository was archived by the owner on Jan 7, 2023. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/tc-main/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ function makeWindow () {
case 'darwin':
app.hide()
break
case 'linux':
main.hide()
break
default:
app.quit()
}
Expand Down
46 changes: 38 additions & 8 deletions src/tc-renderer/lib/startup/tray-icon.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,29 @@
import icon16 from '../../../assets/icon16.png'
import icon256 from '../../../assets/icon256.png'
import settings from './../settings/settings'
import electron from 'electron'

let tray
const Tray = electron.remote.Tray
const nativeImage = electron.remote.nativeImage
const Menu = electron.remote.Menu
const app = electron.remote.app
const ipcRenderer = electron.ipcRenderer
const browserWindow = electron.remote.BrowserWindow

export default function makeTrayIconOnWindows () {
if (process.platform !== 'win32') return null
const Tray = electron.remote.Tray
const nativeImage = electron.remote.nativeImage
const Menu = electron.remote.Menu
const app = electron.remote.app
const ipcRenderer = electron.ipcRenderer
const browserWindow = electron.remote.BrowserWindow
export default function setupTrayIcon() {
switch (process.platform) {
case 'win32':
makeTrayIconOnWindows();
break;
case 'linux':
makeTrayIconOnLinux();
break
default:
return null
}
}
function makeTrayIconOnWindows () {
tray = new Tray(nativeImage.createFromDataURL(icon16))

tray.on('click', () => browserWindow.getAllWindows()[0].show())
Expand Down Expand Up @@ -42,6 +54,24 @@ export default function makeTrayIconOnWindows () {
}
}

function makeTrayIconOnLinux () {
const main = electron.remote.getCurrentWindow()
tray = new Tray(nativeImage.createFromDataURL(icon256))

tray.on('click', () => browserWindow.getAllWindows()[0].show())

tray.setContextMenu(Menu.buildFromTemplate([
{
label: 'Open Tc',
click: () => main.show()
},
{
label: 'Quit Tc',
click: () => app.quit()
}
]))
}

export function getTray () {
return tray
}
4 changes: 2 additions & 2 deletions src/tc-renderer/renderer.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import enableDevTools from './lib/startup/enable-dev-tools'
import changeMacBackgroundColor from './lib/startup/change-mac-background-color'
import enableMenuOnMac from './lib/startup/enable-menu-on-mac'
import preventPageNavigation from './lib/startup/prevent-page-navigation'
import makeTrayIconOnWindows from './lib/startup/tray-icon'
import setupTrayIcon from './lib/startup/tray-icon'
import watchZoomChanges from './lib/startup/app-zoom'
import keepChannelsOnBacklog from './lib/startup/keep-channels-on-backlog'

Expand All @@ -26,6 +26,6 @@ keepTitleUpdated()
changeMacBackgroundColor()
enableMenuOnMac()
preventPageNavigation()
makeTrayIconOnWindows()
setupTrayIcon()
watchZoomChanges()
keepChannelsOnBacklog()