From 08687b76ea4539dea26e8e819a3c3be48b4e3dc3 Mon Sep 17 00:00:00 2001
From: zadam <zadam.apps@gmail.com>
Date: Sat, 8 Feb 2020 18:25:07 +0100
Subject: [PATCH] fix title bar buttons visibility

---
 .../javascripts/widgets/tab_caching_widget.js |  2 +-
 .../javascripts/widgets/title_bar_buttons.js  | 67 +++++++++----------
 2 files changed, 33 insertions(+), 36 deletions(-)

diff --git a/src/public/javascripts/widgets/tab_caching_widget.js b/src/public/javascripts/widgets/tab_caching_widget.js
index 17a5b73f4..62c14fac9 100644
--- a/src/public/javascripts/widgets/tab_caching_widget.js
+++ b/src/public/javascripts/widgets/tab_caching_widget.js
@@ -36,7 +36,7 @@ export default class TabCachingWidget extends TabAwareWidget {
 
         if (!widget) {
             widget = this.widgets[this.tabContext.tabId] = this.widgetFactory();
-            this.children.push(widget);console.log("Creating widget",widget.componentId,"for", this.tabContext.tabId);
+            this.children.push(widget);
             this.$widget.after(widget.render());
 
             widget.eventReceived('setTabContext', {tabContext: this.tabContext});
diff --git a/src/public/javascripts/widgets/title_bar_buttons.js b/src/public/javascripts/widgets/title_bar_buttons.js
index e2fa900c2..6828bf71d 100644
--- a/src/public/javascripts/widgets/title_bar_buttons.js
+++ b/src/public/javascripts/widgets/title_bar_buttons.js
@@ -8,7 +8,6 @@ const TPL = `
     .title-bar-buttons {
         margin-top: 4px;
         min-width: 100px;
-        display: none;
     }
     </style>
 
@@ -19,42 +18,40 @@ const TPL = `
 
 export default class TitleBarButtonsWidget extends BasicWidget {
     doRender() {
-        if (!options.is('nativeTitleBarVisible')) {
-            this.$widget = $(TPL);
-            this.$widget.show();
-
-            const $minimizeBtn = this.$widget.find(".minimize-btn");
-            const $maximizeBtn = this.$widget.find(".maximize-btn");
-            const $closeBtn = this.$widget.find(".close-btn");
-
-            $minimizeBtn.on('click', () => {
-                $minimizeBtn.trigger('blur');
-                const {remote} = require('electron');
-                remote.BrowserWindow.getFocusedWindow().minimize();
-            });
-
-            $maximizeBtn.on('click', () => {
-                $maximizeBtn.trigger('blur');
-                const {remote} = require('electron');
-                const focusedWindow = remote.BrowserWindow.getFocusedWindow();
-
-                if (focusedWindow.isMaximized()) {
-                    focusedWindow.unmaximize();
-                } else {
-                    focusedWindow.maximize();
-                }
-            });
-
-            $closeBtn.on('click', () => {
-                $closeBtn.trigger('blur');
-                const {remote} = require('electron');
-                remote.BrowserWindow.getFocusedWindow().close();
-            });
-        }
-        else {
-            this.$widget = $('<div>');
+        if (!utils.isElectron() || options.is('nativeTitleBarVisible')) {
+            return this.$widget = $('<div>');
         }
 
+        this.$widget = $(TPL);
+
+        const $minimizeBtn = this.$widget.find(".minimize-btn");
+        const $maximizeBtn = this.$widget.find(".maximize-btn");
+        const $closeBtn = this.$widget.find(".close-btn");
+
+        $minimizeBtn.on('click', () => {
+            $minimizeBtn.trigger('blur');
+            const {remote} = require('electron');
+            remote.BrowserWindow.getFocusedWindow().minimize();
+        });
+
+        $maximizeBtn.on('click', () => {
+            $maximizeBtn.trigger('blur');
+            const {remote} = require('electron');
+            const focusedWindow = remote.BrowserWindow.getFocusedWindow();
+
+            if (focusedWindow.isMaximized()) {
+                focusedWindow.unmaximize();
+            } else {
+                focusedWindow.maximize();
+            }
+        });
+
+        $closeBtn.on('click', () => {
+            $closeBtn.trigger('blur');
+            const {remote} = require('electron');
+            remote.BrowserWindow.getFocusedWindow().close();
+        });
+
         return this.$widget;
     }
 }
\ No newline at end of file