From 723fec398bc83317c2af40b952ea2fe1880f66f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20H=C3=A4usler?= Date: Sat, 31 Mar 2018 11:33:02 +0200 Subject: [PATCH] Allow exiting full screen with maximize button on windows (#109) --- src/main/createWindow.js | 3 +++ src/renderer/components/titleBar.vue | 22 ++++++++++++++++++---- static/logo-96px.png | Bin 0 -> 4768 bytes 3 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 static/logo-96px.png diff --git a/src/main/createWindow.js b/src/main/createWindow.js index d64a74be..d861e0a4 100644 --- a/src/main/createWindow.js +++ b/src/main/createWindow.js @@ -17,6 +17,9 @@ const createWindow = (pathname, options = {}) => { const { x, y, width, height } = mainWindowState const winOpt = Object.assign({ x, y, width, height }, { + icon: path.join(__static, 'logo-96px.png'), + minWidth: 450, + minHeight: 220, webPreferences: { webSecurity: false }, diff --git a/src/renderer/components/titleBar.vue b/src/renderer/components/titleBar.vue index 75126679..60c3e843 100644 --- a/src/renderer/components/titleBar.vue +++ b/src/renderer/components/titleBar.vue @@ -13,14 +13,22 @@
-
+
{{ `${HASH[show]} ${wordCount[show]}` }}
-
+
×
@@ -67,20 +75,26 @@ if (index >= len) index = 0 this.show = ITEMS[index] }, + handleCloseClick () { remote.getCurrentWindow().close() }, + handleMaximizeClick () { const win = remote.getCurrentWindow() - if (win.isMaximized()) { + if (win.isFullScreen()) { + win.setFullScreen(false) + } else if (win.isMaximized()) { win.unmaximize() } else { win.maximize() } }, + handleMinimizeClick () { remote.getCurrentWindow().minimize() }, + handleMenuClick () { const win = remote.getCurrentWindow() remote @@ -137,7 +151,7 @@ visibility: hidden; } .active .save-dot.show { - visibility: visible; + visibility: visible; } .title:hover { color: #303133; diff --git a/static/logo-96px.png b/static/logo-96px.png new file mode 100644 index 0000000000000000000000000000000000000000..6af0fbfdf6e0d1a24560d0616a7465a1056fe3ee GIT binary patch literal 4768 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