diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2018-07-05 16:35:24 +0200 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2018-07-05 16:35:24 +0200 |
| commit | 93903c446629c090c9196aae3e13c39ea4795b32 (patch) | |
| tree | 8954deda19ed3f6da53ba4523aaf6eb9c898019b /app/window-controller.js | |
| parent | f5628a7a1a185e5d71cbeb8d1c3d56bd87ff30b5 (diff) | |
| parent | a8c679a8de421df49c6f201972c8ff02df434999 (diff) | |
| download | mullvadvpn-93903c446629c090c9196aae3e13c39ea4795b32.tar.xz mullvadvpn-93903c446629c090c9196aae3e13c39ea4795b32.zip | |
Merge branch 'tray-icon-windows'
Diffstat (limited to 'app/window-controller.js')
| -rw-r--r-- | app/window-controller.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/window-controller.js b/app/window-controller.js index 849da007cf..b27d04d621 100644 --- a/app/window-controller.js +++ b/app/window-controller.js @@ -1,6 +1,6 @@ // @flow -import electron, { screen } from 'electron'; +import { screen } from 'electron'; import type { BrowserWindow, Tray, Display } from 'electron'; export default class WindowController { @@ -62,7 +62,7 @@ export default class WindowController { case 'win32': { // taskbar occupies some part of the screen excluded from work area - const primaryDisplay = electron.screen.getPrimaryDisplay(); + const primaryDisplay = screen.getPrimaryDisplay(); const displaySize = primaryDisplay.size; const workArea = primaryDisplay.workArea; @@ -84,7 +84,7 @@ export default class WindowController { const windowBounds = this._window.getBounds(); const trayBounds = this._tray.getBounds(); - const primaryDisplay = electron.screen.getPrimaryDisplay(); + const primaryDisplay = screen.getPrimaryDisplay(); const workArea = primaryDisplay.workArea; const placement = this._getTrayPlacement(); const maxX = workArea.x + workArea.width - windowBounds.width; |
