Merge pull request #12 from pomerium/macWorkaround

fix white space dropdown mac
pomerium · Mar 8, 2021 · 420d26d · 420d26d
2 parents af81fce + 38937e0
commit 420d26d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main.dev.ts b/src/main.dev.ts
@@ -60,17 +60,15 @@ app.on('ready', async () => {
  .then((name: string) => console.log(`Added Extension: ${name}`))
  .catch((err: Error) => console.log('An error occurred: ', err));
  mainWindow = createWindow();
- mainWindow?.loadURL(`file:https://${__dirname}/index.html`);
  const connections = new Connections();
  const trayMenuHelper = new TrayMenuHelper(connections, mainWindow, null);
  const tray = trayMenuHelper.createTray();
  const menu = menubar({
- tray,
  preloadWindow: true,
  browserWindow: { width: 0, height: 0 },
+ tray,
  });
  trayMenuHelper.setMenu(menu);
-
  menu.on('ready', async () => {
  menu.tray.setContextMenu(trayMenuHelper.createContextMenu(connections));
  ipcMain.on(CONNECT, (evt, args: ConnectionData) => {

diff --git a/src/utils/mainWindow.ts b/src/utils/mainWindow.ts
@@ -30,6 +30,8 @@ const createWindow = () => {
  return false;
  });
 
+ mainWindow?.loadURL(`file:https://${__dirname}/index.html`);
+
  const menuBuilder = new MenuBuilder(mainWindow);
  menuBuilder.buildMenu();