From fbd5ffc1987a31e7913174eb90577574d404ed1c Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 4 Nov 2019 18:02:33 +0000 Subject: [PATCH 1/4] Fix close window behaviour on Macos --- electron_app/src/electron-main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron_app/src/electron-main.js b/electron_app/src/electron-main.js index 48a425c917..7e65c53470 100644 --- a/electron_app/src/electron-main.js +++ b/electron_app/src/electron-main.js @@ -393,7 +393,7 @@ app.on('ready', () => { }); mainWindow.on('close', (e) => { // If we are not quitting and have a tray icon then minimize to tray - if (!global.appQuitting && tray.hasTray()) { + if (!global.appQuitting && (tray.hasTray() || process.platform === 'darwin')) { // On Mac, closing the window just hides it // (this is generally how single-window Mac apps // behave, eg. Mail.app) From 6f85fc9e8cf4368eaf6985223d0ecbd1a96e60a6 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 4 Nov 2019 18:27:35 +0000 Subject: [PATCH 2/4] v1.5.2 --- electron_app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron_app/package.json b/electron_app/package.json index adf119e065..f141aa6bb2 100644 --- a/electron_app/package.json +++ b/electron_app/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.5.1", + "version": "1.5.2", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { From 3cd7e1c18cf9725635a614c0e18e70d1dbaee1a6 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 4 Nov 2019 18:30:36 +0000 Subject: [PATCH 3/4] Prepare changelog for v1.5.2 --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 300f9799c0..7ee93d5ba7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +Changes in [1.5.2](https://github.com/vector-im/riot-web/releases/tag/v1.5.2) (2019-11-04) +========================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.1...v1.5.2) + + * Fix close window behaviour on Macos + [\#11311](https://github.com/vector-im/riot-web/pull/11311) + Changes in [1.5.1](https://github.com/vector-im/riot-web/releases/tag/v1.5.1) (2019-11-04) ========================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.1-rc.2...v1.5.1) From 17027cb5155deb0496fc8b68709988dca5c3510a Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 4 Nov 2019 18:30:37 +0000 Subject: [PATCH 4/4] v1.5.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bf23ac5607..c696840fce 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron_app/src/electron-main.js", - "version": "1.5.1", + "version": "1.5.2", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {