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.

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

Automatically reset window position when disconnecting secondary screen #1280

Merged
merged 15 commits into from
Mar 10, 2020
Merged

Automatically reset window position when disconnecting secondary screen #1280

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
560933c
Added 'Reset Position' to Tray menu
Feb 18, 2020
05283b8
Added ability to quit program with Ctrl+Q
Feb 18, 2020
fbdadf3
Fix linting issues
Feb 18, 2020
1102072
Fix linting and override default rule.
Feb 18, 2020
9f6e1ad
Feature to restore mainWindow position when screen is removed
Feb 25, 2020
073ebf1
Update package.json
sindresorhus Mar 6, 2020
5443b6c
Update source/index.ts based on PR comment
tomioe Mar 8, 2020
c19cab8
Improved readability and fixed incorrect comment grammar
Mar 8, 2020
fd1a60c
Reverted unintentional, irrelevant change and removed tray meny element.
Mar 8, 2020
fe06bc1
Added generated accelerators to top-level menu items and removed unco…
Mar 8, 2020
820c59a
Removed newly introduced keyboard shortcut from README
Mar 8, 2020
6404ed1
Rephrased comment in source/index.ts
tomioe Mar 9, 2020
46083f3
Removed indicator for auto generated accelerators
Mar 9, 2020
70e5573
Merge branch 'tray-position-and-quit-shortcut' of https://github.com/…
Mar 9, 2020
0ac9b6b
restored original menu item labels
Mar 9, 2020
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
8 changes: 8 additions & 0 deletions source/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,14 @@ app.on('second-instance', () => {
}
});

// Main window should move to the same position as it had on another screen
tomioe marked this conversation as resolved.
Show resolved Hide resolved
app.on('ready', () => {
electronScreen.on('display-removed', () => {
const [x, y] = mainWindow.getPosition();
mainWindow.setPosition(x, y);
});
});

function getMessageCount(conversations: Conversation[]): number {
return conversations.filter(({unread}) => unread).length;
}
Expand Down
11 changes: 8 additions & 3 deletions source/menu.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -720,6 +720,7 @@ ${debugInfo()}`;
const linuxWindowsTemplate: MenuItemConstructorOptions[] = [
{
role: 'fileMenu',
label: '&File',
submenu: [
newConversationItem,
{
Expand All @@ -744,23 +745,27 @@ ${debugInfo()}`;
type: 'separator'
},
{
label: 'E&xit',
role: 'quit'
}
]
},
{
role: 'editMenu'
role: 'editMenu',
label: '&Edit'
tomioe marked this conversation as resolved.
Show resolved Hide resolved
},
{
role: 'viewMenu',
label: '&View',
submenu: viewSubmenu
},
{
label: 'Conversation',
tomioe marked this conversation as resolved.
Show resolved Hide resolved
label: '&Conversation',
submenu: conversationSubmenu
},
{
role: 'help',
label: '&Help',
submenu: helpSubmenu
}
];
Expand All @@ -769,7 +774,7 @@ ${debugInfo()}`;

if (is.development) {
template.push({
label: 'Debug',
label: '&Debug',
submenu: debugSubmenu
});
}
Expand Down