summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAndrej Mihajlov <and@mullvad.net>2017-12-08 11:14:15 +0100
committerAndrej Mihajlov <and@mullvad.net>2017-12-08 11:14:15 +0100
commit5406c6b7826e68762e2f6f94fe949b770cb67b89 (patch)
treeddb616795b15d87dd1085756760578da48c8bd74
parentde643498ea69d4c2a1ee8bdc5312ce46608a2627 (diff)
downloadmullvadvpn-5406c6b7826e68762e2f6f94fe949b770cb67b89.tar.xz
mullvadvpn-5406c6b7826e68762e2f6f94fe949b770cb67b89.zip
Show window in all workspaces
-rw-r--r--app/main.js11
-rw-r--r--flow-libs/electron.js.flow2
2 files changed, 9 insertions, 4 deletions
diff --git a/app/main.js b/app/main.js
index 43fbbdbd21..b2612de4d9 100644
--- a/app/main.js
+++ b/app/main.js
@@ -248,7 +248,7 @@ const appDelegate = {
_createWindow: (): BrowserWindow => {
const contentHeight = 568;
- let options = {
+ const options = {
width: 320,
height: contentHeight,
resizable: false,
@@ -265,14 +265,17 @@ const appDelegate = {
// setup window flags to mimic popover on macOS
if(isMacOS) {
- options = Object.assign({}, options, {
+ const win = new BrowserWindow({
+ ...options,
height: contentHeight + 12, // 12 is the size of transparent area around arrow
frame: false,
transparent: true
});
+ win.setVisibleOnAllWorkspaces(true);
+ return win;
+ } else {
+ return new BrowserWindow(options);
}
-
- return new BrowserWindow(options);
},
_setAppMenu: () => {
diff --git a/flow-libs/electron.js.flow b/flow-libs/electron.js.flow
index 5798cda909..90805dde7a 100644
--- a/flow-libs/electron.js.flow
+++ b/flow-libs/electron.js.flow
@@ -135,6 +135,8 @@ declare module 'electron' {
focus(): void;
setPosition(x: number, y: number, animate?: boolean): void;
getBounds(): Rectangle;
+ setVisibleOnAllWorkspaces(visible: boolean): void;
+ isVisibleOnAllWorkspaces(): boolean;
inspectElement(x: number, y: number): void;
isDevToolsOpened(): boolean;isDevToolsOpened(): boolean;
openDevTools(options?: OpenDevToolsOptions): void;