From 95e98006c045edffe6eac9797e9d0aab27f0d71b Mon Sep 17 00:00:00 2001
From: Albin Ekblom <albinekblom@gmail.com>
Date: Tue, 10 Jan 2017 23:05:19 +0100
Subject: [PATCH] Cleanup getWindowHeaderConfig (#1378)

---
 lib/components/header.js | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/lib/components/header.js b/lib/components/header.js
index 9881aada..35a39548 100644
--- a/lib/components/header.js
+++ b/lib/components/header.js
@@ -102,19 +102,21 @@ export default class Header extends Component {
 
   getWindowHeaderConfig() {
     const {showHamburgerMenu, showWindowControls} = this.props;
-    const ret = {
+
+    const defaults = {
       hambMenu: process.platform === 'win32', // show by default on windows
       winCtrls: !this.props.isMac // show by default on windows and linux
     };
-    if (!this.props.isMac) { // allow the user to override the defaults if not on macOS
-      if (showHamburgerMenu !== '') {
-        ret.hambMenu = showHamburgerMenu;
-      }
-      if (showWindowControls !== '') {
-        ret.winCtrls = showWindowControls;
-      }
+
+    // don't allow the user to change defaults on MacOS
+    if (this.props.isMac) {
+      return defaults;
     }
-    return ret;
+
+    return {
+      hambMenu: showHamburgerMenu === '' ? defaults.hambMenu : showHamburgerMenu,
+      winCtrls: showWindowControls === '' ? defaults.winCtrls : showWindowControls
+    };
   }
 
   template(css) {