Move unrelated code out of menu.js and ipc.js

main/windows/about.js

@@ -1,12 +1,12 @@
 var about = module.exports = {
-  create,
+  init,
   win: null
 }
 
 var config = require('../../config')
 var electron = require('electron')
 
-function create () {
+function init () {
   if (about.win) {
     return about.win.show()
   }

main/windows/main.js

@@ -1,8 +1,15 @@
 var main = module.exports = {
-  create,
+  dispatch,
   hide,
+  init,
   send,
+  setAspectRatio,
+  setBounds,
+  setProgress,
+  setTitle,
   show,
+  toggleAlwaysOnTop,
+  toggleDevTools,
   toggleFullScreen,
   win: null
 }
@@ -19,7 +26,7 @@ var tray = require('../tray')
 var HEADER_HEIGHT = 37
 var TORRENT_HEIGHT = 100
 
-function create () {
+function init () {
   if (main.win) {
     return main.win.show()
   }
@@ -42,21 +49,30 @@ function create () {
   if (win.setSheetOffset) win.setSheetOffset(HEADER_HEIGHT)
 
   win.webContents.on('dom-ready', function () {
-    menu.onToggleFullScreen()
+    menu.onToggleFullScreen(main.win.isFullScreen())
   })
 
   win.on('blur', function () {
-    menu.onWindowHide()
-    tray.onWindowHide()
+    menu.onWindowBlur()
+    tray.onWindowBlur()
   })
 
   win.on('focus', function () {
-    menu.onWindowShow()
-    tray.onWindowShow()
+    menu.onWindowFocus()
+    tray.onWindowFocus()
   })
 
-  win.on('enter-full-screen', () => menu.onToggleFullScreen(true))
-  win.on('leave-full-screen', () => menu.onToggleFullScreen(false))
+  win.on('enter-full-screen', function () {
+    menu.onToggleFullScreen(true)
+    send('fullscreenChanged', true)
+    win.setMenuBarVisibility(false)
+  })
+
+  win.on('leave-full-screen', function () {
+    menu.onToggleFullScreen(false)
+    send('fullscreenChanged', false)
+    win.setMenuBarVisibility(true)
+  })
 
   win.on('close', function (e) {
     if (process.platform !== 'darwin' && !tray.hasTray()) {
@@ -64,15 +80,115 @@ function create () {
     } else if (!app.isQuitting) {
       e.preventDefault()
       win.hide()
-      win.send('dispatch', 'backToList')
     }
   })
 }
 
-function getIconPath () {
-  return process.platform === 'win32'
-    ? config.APP_ICON + '.ico'
-    : config.APP_ICON + '.png'
+function dispatch (...args) {
+  send('dispatch', ...args)
+}
+
+function hide () {
+  if (!main.win) return
+  main.win.send('dispatch', 'backToList')
+  main.win.hide()
+}
+
+function send (...args) {
+  if (!main.win) return
+  main.win.send(...args)
+}
+
+/**
+ * Enforce window aspect ratio. Remove with 0. (OS X)
+ */
+function setAspectRatio (aspectRatio) {
+  if (!main.win) return
+  main.win.setAspectRatio(aspectRatio)
+}
+
+/**
+ * Change the size of the window.
+ * TODO: Clean this up? Seems overly complicated.
+ */
+function setBounds (bounds, maximize) {
+  // Do nothing in fullscreen
+  if (!main.win || main.win.isFullScreen()) {
+    log('setBounds: not setting bounds because we\'re in full screen')
+    return
+  }
+
+  // Maximize or minimize, if the second argument is present
+  var willBeMaximized
+  if (maximize === true) {
+    if (!main.win.isMaximized()) {
+      log('setBounds: maximizing')
+      main.win.maximize()
+    }
+    willBeMaximized = true
+  } else if (maximize === false) {
+    if (main.win.isMaximized()) {
+      log('setBounds: unmaximizing')
+      main.win.unmaximize()
+    }
+    willBeMaximized = false
+  } else {
+    willBeMaximized = main.win.isMaximized()
+  }
+
+  // Assuming we're not maximized or maximizing, set the window size
+  if (!willBeMaximized) {
+    log('setBounds: setting bounds to ' + JSON.stringify(bounds))
+    if (bounds.x === null && bounds.y === null) {
+      // X and Y not specified? By default, center on current screen
+      var scr = electron.screen.getDisplayMatching(main.win.getBounds())
+      bounds.x = Math.round(scr.bounds.x + scr.bounds.width / 2 - bounds.width / 2)
+      bounds.y = Math.round(scr.bounds.y + scr.bounds.height / 2 - bounds.height / 2)
+      log('setBounds: centered to ' + JSON.stringify(bounds))
+    }
+    main.win.setBounds(bounds, true)
+  } else {
+    log('setBounds: not setting bounds because of window maximization')
+  }
+}
+
+/**
+ * Set progress bar to [0, 1]. Indeterminate when > 1. Remove with < 0.
+ */
+function setProgress (progress) {
+  if (!main.win) return
+  main.win.setProgressBar(progress)
+}
+
+function setTitle (title) {
+  if (!main.win) return
+  main.win.setTitle(title)
+}
+
+function show () {
+  if (!main.win) return
+  main.win.show()
+}
+
+// Sets whether the window should always show on top of other windows
+function toggleAlwaysOnTop (flag) {
+  if (!main.win) return
+  if (flag == null) {
+    flag = !main.isAlwaysOnTop()
+  }
+  log(`toggleAlwaysOnTop ${flag}`)
+  main.setAlwaysOnTop(flag)
+  menu.onToggleAlwaysOnTop(flag)
+}
+
+function toggleDevTools () {
+  if (!main.win) return
+  log('toggleDevTools')
+  if (main.win.webContents.isDevToolsOpened()) {
+    main.win.webContents.closeDevTools()
+  } else {
+    main.win.webContents.openDevTools({ detach: true })
+  }
 }
 
 function toggleFullScreen (flag) {
@@ -82,29 +198,18 @@ function toggleFullScreen (flag) {
 
   if (flag == null) flag = !main.win.isFullScreen()
 
-  log('toggleFullScreen %s', flag)
+  log(`toggleFullScreen ${flag}`)
 
   if (flag) {
-    // Fullscreen behaves oddly unless the aspect ratio is disabled. (OS X)
+    // Fullscreen and aspect ratio do not play well together. (OS X)
     main.win.setAspectRatio(0)
   }
 
   main.win.setFullScreen(flag)
 }
 
-function send (...args) {
-  if (!main.win) return
-  main.win.send(...args)
-}
-
-function show () {
-  if (!main.win) return
-  main.win.show()
-}
-
-function hide () {
-  if (!main.win) return
-  main.win.hide()
-}
-
+function getIconPath () {
+  return process.platform === 'win32'
+    ? config.APP_ICON + '.ico'
+    : config.APP_ICON + '.png'
 }

main/windows/webtorrent.js

@@ -1,14 +1,17 @@
 var webtorrent = module.exports = {
-  create,
+  init,
   send,
   show,
+  toggleDevTools,
   win: null
 }
 
-var config = require('../../config')
 var electron = require('electron')
 
-function create () {
+var config = require('../../config')
+var log = require('../log')
+
+function init () {
   var win = webtorrent.win = new electron.BrowserWindow({
     backgroundColor: '#1E1E1E',
     center: true,
@@ -46,3 +49,14 @@ function send (...args) {
   if (!webtorrent.win) return
   webtorrent.win.send(...args)
 }
+
+function toggleDevTools () {
+  if (!webtorrent.win) return
+  log('toggleDevTools')
+  if (webtorrent.win.webContents.isDevToolsOpened()) {
+    webtorrent.win.webContents.closeDevTools()
+    webtorrent.win.hide()
+  } else {
+    webtorrent.win.webContents.openDevTools({ detach: true })
+  }
+}