Merge pull request #657 from kitematic/windows

Windows installer signing and header fixes

Gruntfile.js

@@ -18,6 +18,9 @@ module.exports = function (grunt) {
   env.NODE_PATH = '..:' + env.NODE_PATH;
   env.NODE_ENV = target;
 
+  var certificateFile = grunt.option('certificate');
+  var certificatePassword = grunt.option('password');
+
   var version = function (str) {
     var match = str.match(/(\d+\.\d+\.\d+)/);
     return match ? match[1] : null;
@@ -107,7 +110,9 @@ module.exports = function (grunt) {
       setupIcon: 'util/kitematic.ico',
       description: 'Kitematic',
       title: 'Kitematic',
-      version: packagejson.version
+      version: packagejson.version,
+      certificateFile: certificateFile,
+      certificatePassword: certificatePassword
     },
 
     // docker binaries

src/components/Header.react.js

@@ -63,10 +63,21 @@ var Header = React.createClass({
     remote.getCurrentWindow().minimize();
   },
   handleFullscreen: function () {
-    remote.getCurrentWindow().setFullScreen(!remote.getCurrentWindow().isFullScreen());
-    this.setState({
-      fullscreen: remote.getCurrentWindow().isFullScreen()
-    });
+    if (util.isWindows()) {
+      if (remote.getCurrentWindow().isMaximized()) {
+        remote.getCurrentWindow().unmaximize();
+      } else {
+        remote.getCurrentWindow().maximize();
+      }
+      this.setState({
+        fullscreen: remote.getCurrentWindow().isMaximized()
+      });
+    } else {
+      remote.getCurrentWindow().setFullScreen(!remote.getCurrentWindow().isFullScreen());
+      this.setState({
+        fullscreen: remote.getCurrentWindow().isFullScreen()
+      });
+    }
   },
   handleFullscreenHover: function () {
     this.update();

styles/header.less

@@ -111,14 +111,14 @@
       &.button-fullscreen {
         .icon {
           background-position: center;
-          .at2x('windows-fullscreen.png', 14px, 2px);
+          .at2x('windows-fullscreen.png', 14px, 12px);
         }
       }
 
       &.button-fullscreenclose {
         .icon {
           background-position: center;
-          .at2x('windows-fullscreenclose.png', 14px, 2px);
+          .at2x('windows-fullscreenclose.png', 14px, 12px);
         }
       }