From 2cc0d0c32f252eb83a1bd3a5868cfe1af93b80aa Mon Sep 17 00:00:00 2001
From: develar <develar@gmail.com>
Date: Fri, 6 Oct 2017 09:39:00 +0200
Subject: [PATCH] fix: use ELECTRON_WEBPACK_WDS_PORT env instead of hardcoded
 webpack-dev-server port number

Focus main window if dev tool window opened on start
---
 src/main/index.js | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/main/index.js b/src/main/index.js
index f930bad..e332428 100644
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -8,26 +8,35 @@ const isDevelopment = process.env.NODE_ENV !== 'production'
 // Necessary to prevent win from being garbage collected
 let mainWindow
 
-function createMainWindow () {
+function createMainWindow() {
   // Construct new BrowserWindow
-  let win = new BrowserWindow()
+  const window = new BrowserWindow()
 
   // Set url for `win`
     // points to `webpack-dev-server` in development
     // points to `index.html` in production
-  let url = isDevelopment
-    ? 'http://localhost:9080'
+  const url = isDevelopment
+    ? `http://localhost:${process.env.ELECTRON_WEBPACK_WDS_PORT}`
     : `file://${__dirname}/index.html`
 
-  if (isDevelopment) win.webContents.openDevTools()
+  if (isDevelopment) {
+    window.webContents.openDevTools()
+  }
 
-  win.loadURL(url)
+  window.loadURL(url)
 
-  win.on('closed', () => {
+  window.on('closed', () => {
     mainWindow = null
   })
 
-  return win
+  window.webContents.on('devtools-opened', () => {
+    window.focus()
+    setImmediate(() => {
+      window.focus()
+    })
+  })
+
+  return window
 }
 
 // Quit application when all windows are closed