INT-663 extract windows size constants from window-manager.js

squashed:
:bug: fix window config sizing

Author: kangas

gulpfile.js

@@ -95,7 +95,7 @@ gulp.task('watch', function() {
   gulp.watch(['src/*.jade'], ['build:pages']);
   gulp.watch('images/{*,**/*}', ['copy:images']);
   gulp.watch('fonts/*', ['copy:fonts']);
-  gulp.watch(['src/electron/*'], ['copy:js']);
+  gulp.watch(['src/electron/{*,**/*}'], ['copy:js']);
   gulp.watch('package.json', function() {
     gutil.log('package.json changed!');
     sequence('copy:package.json', 'npm:install');
@@ -238,7 +238,7 @@ gulp.task('copy:js', function() {
   return merge(
     gulp.src(['main.js'])
       .pipe(gulp.dest('build/')),
-    gulp.src(['src/electron/*'])
+    gulp.src(['src/electron/{*,**/*}'])
       .pipe(gulp.dest('build/src/electron'))
   );
 });

src/connect/index.js

@@ -3,6 +3,7 @@ var authFields = require('./auth-fields');
 var sslFields = require('./ssl-fields');
 var SidebarView = require('./sidebar');
 var ConnectionCollection = require('../models/connection-collection');
+var config = require('../electron/config');
 
 var format = require('util').format;
 var $ = require('jquery');
@@ -90,11 +91,14 @@ var ConnectView = View.extend({
       },
       {
         type: function(el, authOpen) {
+          var width = config.windows.DEFAULT_WIDTH_DIALOG;
+          var height = config.windows.DEFAULT_HEIGHT_DIALOG;
           if (authOpen) {
-            window.resizeTo(window.outerWidth, 630);
-          } else {
-            window.resizeTo(window.outerWidth, 410);
+            // Account for extra height added by auth fields so
+            // the user doesnt have to scroll.
+            height += 220;
           }
+          window.resizeTo(width, height);
         }
       }
     ],

src/electron/config/index.js

@@ -0,0 +1,3 @@
+module.exports = {
+  windows: require('./windows')
+};

src/electron/config/windows.js

@@ -0,0 +1,29 @@
+/**
+ * Constants for window sizes on multiple platforms
+ */
+
+/**
+* The outer dimensions to use for new windows.
+*/
+exports.DEFAULT_WIDTH = 1024;
+exports.DEFAULT_HEIGHT = 700;
+
+/**
+* The outer window dimensions to use for new dialog
+* windows like the connection and setup dialogs.
+*/
+exports.DEFAULT_WIDTH_DIALOG = 640;
+exports.DEFAULT_HEIGHT_DIALOG = 470;
+/**
+* Adjust the heights to account for platforms
+* that use a single menu bar at the top of the screen.
+*/
+if (process.platform === 'linux') {
+  exports.DEFAULT_HEIGHT_DIALOG -= 30;
+  exports.DEFAULT_HEIGHT -= 30;
+} else if (process.platform === 'darwin') {
+  exports.DEFAULT_HEIGHT_DIALOG -= 60;
+  exports.DEFAULT_HEIGHT -= 60;
+}
+
+module.exports = exports;

src/electron/window-manager.js

@@ -8,6 +8,7 @@ var _ = require('lodash');
 var app = require('app');
 var attachMenu = require('./menu');
 var BrowserWindow = require('browser-window');
+var config = require('./config');
 var debug = require('debug')('scout-electron:window-manager');
 
 /**
@@ -21,30 +22,6 @@ var RESOURCES = path.resolve(__dirname, '../../');
  */
 var DEFAULT_URL = 'file://' + path.join(RESOURCES, 'index.html#connect');
 
-/**
- * The outer dimensions to use for new windows.
- */
-var DEFAULT_WIDTH = 1024;
-var DEFAULT_HEIGHT = 700;
-
-/**
- * The outer window dimensions to use for new dialog
- * windows like the connection and setup dialogs.
- */
-var DEFAULT_WIDTH_DIALOG = 640;
-var DEFAULT_HEIGHT_DIALOG = 470;
-/**
- * Adjust the heights to account for platforms
- * that use a single menu bar at the top of the screen.
- */
-if (process.platform === 'linux') {
-  DEFAULT_HEIGHT_DIALOG -= 30;
-  DEFAULT_HEIGHT -= 30;
-} else if (process.platform === 'darwin') {
-  DEFAULT_HEIGHT_DIALOG -= 60;
-  DEFAULT_HEIGHT -= 60;
-}
-
 /**
  * We want want the Connect dialog window to be special
  * and for there to ever only be one instance of it
@@ -71,8 +48,8 @@ var windowsOpenCount = 0;
  */
 module.exports.create = function(opts) {
   opts = _.defaults(opts || {}, {
-    width: DEFAULT_WIDTH,
-    height: DEFAULT_HEIGHT,
+    width: config.windows.DEFAULT_WIDTH,
+    height: config.windows.DEFAULT_HEIGHT,
     url: DEFAULT_URL
   });
 
@@ -135,8 +112,8 @@ app.on('show connect dialog', function(opts) {
 
   opts = opts || {};
   opts = _.extend(opts || {}, {
-    height: DEFAULT_HEIGHT_DIALOG,
-    width: DEFAULT_WIDTH_DIALOG,
+    width: config.windows.DEFAULT_WIDTH_DIALOG,
+    height: config.windows.DEFAULT_HEIGHT_DIALOG,
     url: DEFAULT_URL
   });
   module.exports.create(opts);