Skip to content

Fullscreen shortcut for non macOS #1754

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.

Sign up for GitHub

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

Merged
Rokt33r merged 9 commits into from
Apr 20, 2018
Merged

Fullscreen shortcut for non macOS #1754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f014423
Fullscreen shortcut for non macOS is now F11
yougotwill Mar 25, 2018
ee78e11
Moved 'Toggle Fullscreen' to the View label used non-OS specific full…
yougotwill Mar 27, 2018
9a445e3
fixed trailing spaces
yougotwill Mar 27, 2018
e1e3cc7
moved label to a better position
yougotwill Mar 28, 2018
11f8cfe
fixed label key-spacing
yougotwill Mar 28, 2018
b46b958
updated for separate methods for full screen depending on the platform
yougotwill Mar 30, 2018
a32cfc8
Revert "updated for separate methods for full screen depending on the…
yougotwill Mar 30, 2018
1d4f176
Changed top:focus-search shortcut
yougotwill Apr 17, 2018
0bce96b
Merge branch 'master' into crossplatform_fullscreen_shortcuts
yougotwill Apr 17, 2018
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
4 changes: 2 additions & 2 deletions browser/main/NoteList/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,8 +282,8 @@ class NoteList extends React.Component {
ee.emit('detail:focus')
}

// F or S key
if (e.keyCode === 70 || e.keyCode === 83) {
// L or S key
if (e.keyCode === 76 || e.keyCode === 83) {
e.preventDefault()
ee.emit('top:focus-search')
}
Expand Down
19 changes: 12 additions & 7 deletions lib/main-menu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,10 +252,20 @@ const view = {
},
{
label: 'Focus Search',
accelerator: 'Control+S',
accelerator: 'CommandOrControl+Shift+L',
click () {
mainWindow.webContents.send('top:focus-search')
}
},
{
type: 'separator'
},
{
label: 'Toggle Full Screen',
accelerator: macOS ? 'Command+Control+F' : 'F11',
click () {
mainWindow.setFullScreen(!mainWindow.isFullScreen())
}
}
]
}
Expand All @@ -265,7 +275,7 @@ let editorFocused
// Define extra shortcut keys
mainWindow.webContents.on('before-input-event', (event, input) => {
// Synonyms for Search (Find)
if (input.control && input.key === 'f' && input.type === 'keyDown') {
if (input.control && input.key === 'l' && input.type === 'keyDown') {
if (!editorFocused) {
mainWindow.webContents.send('top:focus-search')
event.preventDefault()
Expand All @@ -285,11 +295,6 @@ const window = {
accelerator: 'Command+M',
selector: 'performMiniaturize:'
},
{
label: 'Toggle Full Screen',
accelerator: 'Command+Control+F',
selector: 'toggleFullScreen:'
},
{
label: 'Close',
accelerator: 'Command+W',
Expand Down