Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds an always on top menu item. #137

Merged
merged 1 commit into from
Aug 20, 2016
Merged
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
203 changes: 60 additions & 143 deletions packages/reactotron-app/main.development.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,15 @@ app.on('ready', () => {
titleBarStyle: 'hidden'
})

// toggle the menu on top/bottom
function toggleAlwaysOnTop () {
const nextValue = !mainWindow.isAlwaysOnTop()
mainWindow.setAlwaysOnTop(nextValue)
// fragile way of getting the Always On Top
const menuItem = menu.items[3].submenu.items[0]
menuItem.checked = nextValue
}

mainWindow.loadURL(`file://${__dirname}/App/App.html`)

mainWindow.webContents.on('did-finish-load', () => {
Expand All @@ -35,168 +44,76 @@ app.on('ready', () => {
if (process.platform === 'darwin') {
template = [{
label: 'Reactotron',
submenu: [{
label: 'About Reactotron',
selector: 'orderFrontStandardAboutPanel:'
}, {
type: 'separator'
}, {
label: 'Services',
submenu: []
}, {
type: 'separator'
}, {
label: 'Hide Reactotron',
accelerator: 'Command+H',
selector: 'hide:'
}, {
label: 'Hide Others',
accelerator: 'Command+Shift+H',
selector: 'hideOtherApplications:'
}, {
label: 'Show All',
selector: 'unhideAllApplications:'
}, {
type: 'separator'
}, {
label: 'Quit',
accelerator: 'Command+Q',
click () {
app.quit()
}
}]
submenu: [
{ label: 'About Reactotron', selector: 'orderFrontStandardAboutPanel:' },
{ type: 'separator' },
{ label: 'Services', submenu: [] },
{ type: 'separator' },
{ label: 'Hide Reactotron', accelerator: 'Command+H', selector: 'hide:' },
{ label: 'Hide Others', accelerator: 'Command+Shift+H', selector: 'hideOtherApplications:' },
{ label: 'Show All', selector: 'unhideAllApplications:' },
{ type: 'separator' },
{ label: 'Quit', accelerator: 'Command+Q', click () { app.quit() } }
]
}, {
label: 'Edit',
submenu: [{
label: 'Undo',
accelerator: 'Command+Z',
selector: 'undo:'
}, {
label: 'Redo',
accelerator: 'Shift+Command+Z',
selector: 'redo:'
}, {
type: 'separator'
}, {
label: 'Cut',
accelerator: 'Command+X',
selector: 'cut:'
}, {
label: 'Copy',
accelerator: 'Command+C',
selector: 'copy:'
}, {
label: 'Paste',
accelerator: 'Command+V',
selector: 'paste:'
}, {
label: 'Select All',
accelerator: 'Command+A',
selector: 'selectAll:'
}]
submenu: [
{ label: 'Undo', accelerator: 'Command+Z', selector: 'undo:' },
{ label: 'Redo', accelerator: 'Shift+Command+Z', selector: 'redo:' },
{ type: 'separator' },
{ label: 'Cut', accelerator: 'Command+X', selector: 'cut:' },
{ label: 'Copy', accelerator: 'Command+C', selector: 'copy:' },
{ label: 'Paste', accelerator: 'Command+V', selector: 'paste:' },
{ label: 'Select All', accelerator: 'Command+A', selector: 'selectAll:' }
]
}, {
label: 'View',
submenu: (process.env.NODE_ENV === 'development') ? [{
label: 'Reload',
accelerator: 'Command+R',
click () {
mainWindow.webContents.reload()
}
}, {
label: 'Toggle Full Screen',
accelerator: 'Ctrl+Command+F',
click () {
mainWindow.setFullScreen(!mainWindow.isFullScreen())
}
}, {
label: 'Toggle Developer Tools',
accelerator: 'Alt+Command+I',
click () {
mainWindow.toggleDevTools()
}
}] : [{
label: 'Toggle Full Screen',
accelerator: 'Ctrl+Command+F',
click () {
mainWindow.setFullScreen(!mainWindow.isFullScreen())
}
}]
submenu: (process.env.NODE_ENV === 'development') ? [
{ label: 'Reload', accelerator: 'Command+R', click () { mainWindow.webContents.reload() } },
{ label: 'Toggle Developer Tools', accelerator: 'Alt+Command+I', click () { mainWindow.toggleDevTools() } }
] : [
{ label: 'Toggle Full Screen', accelerator: 'Ctrl+Command+F', click () { mainWindow.setFullScreen(!mainWindow.isFullScreen()) } }
]
}, {
label: 'Window',
submenu: [{
label: 'Minimize',
accelerator: 'Command+M',
selector: 'performMiniaturize:'
}, {
label: 'Close',
accelerator: 'Command+W',
selector: 'performClose:'
}, {
type: 'separator'
}, {
label: 'Bring All to Front',
selector: 'arrangeInFront:'
}]
submenu: [
{ type: 'checkbox', label: 'Always On Top', click () { toggleAlwaysOnTop() } },
{ type: 'separator' },
{ label: 'Minimize', accelerator: 'Command+M', selector: 'performMiniaturize:' },
{ label: 'Close', accelerator: 'Command+W', selector: 'performClose:' },
{ type: 'separator' },
{ label: 'Bring All to Front', selector: 'arrangeInFront:' }
]
}, {
label: 'Help',
submenu: [{
label: 'Visit on Github',
click () {
shell.openExternal('https://github.com/reactotron/reactotron')
}
}]
submenu: [
{ label: 'Visit on Github', click () { shell.openExternal('https://github.com/reactotron/reactotron') } }
]
}]

menu = Menu.buildFromTemplate(template)
Menu.setApplicationMenu(menu)
} else {
template = [{
label: '&File',
submenu: [{
label: '&Open',
accelerator: 'Ctrl+O'
}, {
label: '&Close',
accelerator: 'Ctrl+W',
click () {
mainWindow.close()
}
}]
submenu: [
{ label: '&Open', accelerator: 'Ctrl+O' },
{ label: '&Close', accelerator: 'Ctrl+W', click () { mainWindow.close() } }
]
}, {
label: '&View',
submenu: (process.env.NODE_ENV === 'development') ? [{
label: '&Reload',
accelerator: 'Ctrl+R',
click () {
mainWindow.webContents.reload()
}
}, {
label: 'Toggle &Full Screen',
accelerator: 'F11',
click () {
mainWindow.setFullScreen(!mainWindow.isFullScreen())
}
}, {
label: 'Toggle &Developer Tools',
accelerator: 'Alt+Ctrl+I',
click () {
mainWindow.toggleDevTools()
}
}] : [{
label: 'Toggle &Full Screen',
accelerator: 'F11',
click () {
mainWindow.setFullScreen(!mainWindow.isFullScreen())
}
}]
submenu: (process.env.NODE_ENV === 'development') ? [
{ label: '&Reload', accelerator: 'Ctrl+R', click () { mainWindow.webContents.reload() } },
{ label: 'Toggle &Developer Tools', accelerator: 'Alt+Ctrl+I', click () { mainWindow.toggleDevTools() } }
] : [
{ type: 'checkbox', label: 'Always On Top', click () { toggleAlwaysOnTop(this) } },
{ label: 'Toggle &Full Screen', accelerator: 'F11', click () { mainWindow.setFullScreen(!mainWindow.isFullScreen()) } }
]
}, {
label: 'Help',
submenu: [{
label: 'Visit on Github',
click () {
shell.openExternal('https://github.com/reactotron/reactotron')
}
}]
submenu: [
{ label: 'Visit on Github', click () { shell.openExternal('https://github.com/reactotron/reactotron') } }
]
}]
menu = Menu.buildFromTemplate(template)
mainWindow.setMenu(menu)
Expand Down