From 1e405b318fc4c071dc3e1a7f875de50e44494c74 Mon Sep 17 00:00:00 2001 From: Susmitha Girumala Date: Tue, 14 Sep 2021 17:36:17 -0400 Subject: [PATCH 1/6] chore: Allow disabling electron frame on all desktop OSs --- addons/api/mirage/scenarios/ipc.js | 6 +++--- ui/desktop/README.md | 1 + ui/desktop/app/controllers/application.js | 11 +++++------ ui/desktop/app/routes/application.js | 3 ++- ui/desktop/app/templates/application.hbs | 4 +++- ui/desktop/electron-app/src/index.js | 11 +++++++++-- ui/desktop/electron-app/src/ipc/handlers.js | 9 ++++++++- 7 files changed, 31 insertions(+), 14 deletions(-) diff --git a/addons/api/mirage/scenarios/ipc.js b/addons/api/mirage/scenarios/ipc.js index 04ff375d4..e10ef7508 100644 --- a/addons/api/mirage/scenarios/ipc.js +++ b/addons/api/mirage/scenarios/ipc.js @@ -127,10 +127,10 @@ export default function initializeMockIPC(server) { } /** - * Check for browsers running on windows OS + * Check for OS frame */ - isWindowsOS() { - return Boolean(window.navigator.userAgent.match(/(windows)/i)); + isFrameless() { + return true; } /** diff --git a/ui/desktop/README.md b/ui/desktop/README.md index 8efc3e47f..2751287f2 100644 --- a/ui/desktop/README.md +++ b/ui/desktop/README.md @@ -78,6 +78,7 @@ These environment variables may be used to customized the build. | `APP_UPDATER_LATEST_VERSION_TAG` | Next version for comparison with current version. | | `APP_UPDATER_LATEST_VERSION_LOCATION` | Location of app release to use for updating client. Can be a filepath or url. | | `BYPASS_CLI_SETUP` | Disable download and extraction of cli. For development use only. | +| `BYPASS_OS_SHELL` | Disable OS shell with window actions. For internal use only. | ### Building for Production diff --git a/ui/desktop/app/controllers/application.js b/ui/desktop/app/controllers/application.js index 10cf5fcc7..27471994d 100644 --- a/ui/desktop/app/controllers/application.js +++ b/ui/desktop/app/controllers/application.js @@ -15,13 +15,12 @@ export default class ApplicationController extends Controller { // =attributes /** - * Display OS window actions (minimize, fullscreen, close) for - * Windows and Linux as OS frame/shell is disable. - * Does not apply to MacOS. + * Check for MacOS frame * @type {boolean} */ - @computed('isMacOS') - get isFrameless() { - return !this.isMacOS; + @computed('isMacOS', 'isFrameless') + get hasMacOSFrame() { + console.log('hasMacOSFrame ', this.isMacOS && !this.isFrameless); + return this.isMacOS && !this.isFrameless; } } diff --git a/ui/desktop/app/routes/application.js b/ui/desktop/app/routes/application.js index 4acb8a175..55bae783d 100644 --- a/ui/desktop/app/routes/application.js +++ b/ui/desktop/app/routes/application.js @@ -31,10 +31,11 @@ export default class ApplicationRoute extends Route { } /** - * Add OS config on controller. + * Add window frame config on controller. */ async setupController(controller) { controller.set('isMacOS', await this.ipc.invoke('isMacOS')); + controller.set('isFrameless', await this.ipc.invoke('isFrameless')); } // =actions diff --git a/ui/desktop/app/templates/application.hbs b/ui/desktop/app/templates/application.hbs index 501eb1db1..78f749688 100644 --- a/ui/desktop/app/templates/application.hbs +++ b/ui/desktop/app/templates/application.hbs @@ -1,3 +1,5 @@ + + {{page-title (app-name)}} diff --git a/ui/desktop/electron-app/src/index.js b/ui/desktop/electron-app/src/index.js index 66272336a..752a09fdf 100644 --- a/ui/desktop/electron-app/src/index.js +++ b/ui/desktop/electron-app/src/index.js @@ -113,11 +113,18 @@ app.on('ready', async () => { } Menu.setApplicationMenu(menuTemplate); + /** + * Enable electron OS frame for MacOS only. + * Disable frame regardless of OS using `BYPASS_OS_SHELL` + */ + let showFrame = isMac(); + if (process.env.BYPASS_OS_SHELL) showFrame = false; + const browserWindowOptions = { width: 1280, height: 760, - titleBarStyle: 'hiddenInset', - frame: isMac(), + frame: showFrame, + titleBarStyle: showFrame ? 'hiddenInset' : 'none', webPreferences: { partition, sandbox: true, diff --git a/ui/desktop/electron-app/src/ipc/handlers.js b/ui/desktop/electron-app/src/ipc/handlers.js index d66182f4c..c5e795e99 100644 --- a/ui/desktop/electron-app/src/ipc/handlers.js +++ b/ui/desktop/electron-app/src/ipc/handlers.js @@ -69,7 +69,14 @@ handle('connect', ({ target_id, token, host_id }) => handle('stop', ({ session_id }) => sessionManager.stopById(session_id)); /** - * Check for MacOS OS + * Check for frameless window state. Only MacOS uses default OS frame. + * Frameless window disables OS window actions (minimize, fullscreen, close). + * Enable `BYPASS_OS_SHELL` to bypass OS verification for frame. + */ +handle('isFrameless', () => !isMac() || process.env.BYPASS_OS_SHELL); + +/** + * Check for MacOS */ handle('isMacOS', () => isMac()); From aecfdbb6352eff9fa17b902574ca12f46db9eed0 Mon Sep 17 00:00:00 2001 From: Susmitha Girumala Date: Wed, 15 Sep 2021 09:09:16 -0400 Subject: [PATCH 2/6] fix: Lint fix --- ui/desktop/app/templates/application.hbs | 2 -- 1 file changed, 2 deletions(-) diff --git a/ui/desktop/app/templates/application.hbs b/ui/desktop/app/templates/application.hbs index 78f749688..482661bd4 100644 --- a/ui/desktop/app/templates/application.hbs +++ b/ui/desktop/app/templates/application.hbs @@ -1,5 +1,3 @@ - - {{page-title (app-name)}} Date: Wed, 15 Sep 2021 10:54:28 -0400 Subject: [PATCH 3/6] chore: Fix tests for macos frame --- ui/desktop/app/controllers/application.js | 3 +-- ui/desktop/app/templates/application.hbs | 2 +- .../tests/acceptance/application-test.js | 26 +++++++++++++------ ui/desktop/tests/helpers/window-mock-ipc.js | 1 + 4 files changed, 21 insertions(+), 11 deletions(-) diff --git a/ui/desktop/app/controllers/application.js b/ui/desktop/app/controllers/application.js index 27471994d..8d9c53da5 100644 --- a/ui/desktop/app/controllers/application.js +++ b/ui/desktop/app/controllers/application.js @@ -19,8 +19,7 @@ export default class ApplicationController extends Controller { * @type {boolean} */ @computed('isMacOS', 'isFrameless') - get hasMacOSFrame() { - console.log('hasMacOSFrame ', this.isMacOS && !this.isFrameless); + get isFrameMacOS() { return this.isMacOS && !this.isFrameless; } } diff --git a/ui/desktop/app/templates/application.hbs b/ui/desktop/app/templates/application.hbs index 482661bd4..e4cf86c72 100644 --- a/ui/desktop/app/templates/application.hbs +++ b/ui/desktop/app/templates/application.hbs @@ -8,7 +8,7 @@ diff --git a/ui/desktop/tests/acceptance/application-test.js b/ui/desktop/tests/acceptance/application-test.js index 23a254e0e..4f9cabdee 100644 --- a/ui/desktop/tests/acceptance/application-test.js +++ b/ui/desktop/tests/acceptance/application-test.js @@ -48,20 +48,30 @@ module('Acceptance | origin', function (hooks) { }); test('visiting index on MacOS hides custom window actions', async function (assert) { - assert.expect(3); + assert.expect(4); stubs.ipcService.withArgs('isMacOS').returns(true); + stubs.ipcService.withArgs('isFrameless').returns(false); await visit(urls.origin); - assert.notOk(find('.button-window-close')); - assert.notOk(find('.button-window-minimize')); - assert.notOk(find('.button-window-fullscreen')); + assert.notOk(find('.button-window-close'), 'Window close button'); + assert.notOk(find('.button-window-minimize'), 'Window minimize button'); + assert.notOk(find('.button-window-fullscreen'), 'Window fullscreen button'); + assert.ok( + find('.rose-header.header-cushion'), + 'Adds header padding around native window actions' + ); }); test('visiting index on non-MacOS shows custom window actions', async function (assert) { - assert.expect(3); + assert.expect(4); stubs.ipcService.withArgs('isMacOS').returns(false); + stubs.ipcService.withArgs('isFrameless').returns(true); await visit(urls.origin); - assert.ok(find('.button-window-close')); - assert.ok(find('.button-window-minimize')); - assert.ok(find('.button-window-fullscreen')); + assert.ok(find('.button-window-close'), 'Window close button'); + assert.ok(find('.button-window-minimize'), 'Window minimize button'); + assert.ok(find('.button-window-fullscreen'), 'Window fullscreen button'); + assert.notOk( + find('.rose-header.header-cushion'), + 'Disables header padding around native window actions' + ); }); }); diff --git a/ui/desktop/tests/helpers/window-mock-ipc.js b/ui/desktop/tests/helpers/window-mock-ipc.js index 8151c8cbc..bb9214b15 100644 --- a/ui/desktop/tests/helpers/window-mock-ipc.js +++ b/ui/desktop/tests/helpers/window-mock-ipc.js @@ -18,6 +18,7 @@ class MockIPC { resetOrigin() {} isMacOS() {} + isFrameless() {} } /** From 631d90869f99de9829263af6303f0a550397468c Mon Sep 17 00:00:00 2001 From: Susmitha Girumala Date: Thu, 16 Sep 2021 10:33:56 -0400 Subject: [PATCH 4/6] chore: Refactor DISABLE_WINDOW_CHROME var --- addons/api/mirage/scenarios/ipc.js | 12 +++---- ui/desktop/README.md | 2 +- ui/desktop/app/controllers/application.js | 12 ------- ui/desktop/app/routes/application.js | 7 ++-- ui/desktop/app/templates/application.hbs | 6 ++-- ui/desktop/electron-app/src/index.js | 12 +++---- ui/desktop/electron-app/src/ipc/handlers.js | 14 ++++---- .../tests/acceptance/application-test.js | 34 ++++++++++++------- ui/desktop/tests/helpers/window-mock-ipc.js | 4 +-- 9 files changed, 53 insertions(+), 50 deletions(-) diff --git a/addons/api/mirage/scenarios/ipc.js b/addons/api/mirage/scenarios/ipc.js index e10ef7508..36846194d 100644 --- a/addons/api/mirage/scenarios/ipc.js +++ b/addons/api/mirage/scenarios/ipc.js @@ -120,17 +120,17 @@ export default function initializeMockIPC(server) { } /** - * Check for browsers running on mac OS + * Check for window chrome on MacOS */ - isMacOS() { - return Boolean(window.navigator.userAgent.match(/(macintosh)/i)); + hasMacOSChrome() { + return false; } /** - * Check for OS frame + * Check for OS chrome state */ - isFrameless() { - return true; + isWindowChromeless() { + return false; } /** diff --git a/ui/desktop/README.md b/ui/desktop/README.md index 2751287f2..d2d754eed 100644 --- a/ui/desktop/README.md +++ b/ui/desktop/README.md @@ -78,7 +78,7 @@ These environment variables may be used to customized the build. | `APP_UPDATER_LATEST_VERSION_TAG` | Next version for comparison with current version. | | `APP_UPDATER_LATEST_VERSION_LOCATION` | Location of app release to use for updating client. Can be a filepath or url. | | `BYPASS_CLI_SETUP` | Disable download and extraction of cli. For development use only. | -| `BYPASS_OS_SHELL` | Disable OS shell with window actions. For internal use only. | +| `DISABLE_WINDOW_CHROME` | Disable window chrome. For internal use only. | ### Building for Production diff --git a/ui/desktop/app/controllers/application.js b/ui/desktop/app/controllers/application.js index 8d9c53da5..0eb5226e0 100644 --- a/ui/desktop/app/controllers/application.js +++ b/ui/desktop/app/controllers/application.js @@ -1,7 +1,6 @@ import Controller from '@ember/controller'; import { inject as service } from '@ember/service'; import config from '../config/environment'; -import { computed } from '@ember/object'; export default class ApplicationController extends Controller { // =services @@ -11,15 +10,4 @@ export default class ApplicationController extends Controller { // =attributes notifyTimeout = config.notifyTimeout; - - // =attributes - - /** - * Check for MacOS frame - * @type {boolean} - */ - @computed('isMacOS', 'isFrameless') - get isFrameMacOS() { - return this.isMacOS && !this.isFrameless; - } } diff --git a/ui/desktop/app/routes/application.js b/ui/desktop/app/routes/application.js index 55bae783d..20719a9d3 100644 --- a/ui/desktop/app/routes/application.js +++ b/ui/desktop/app/routes/application.js @@ -34,8 +34,11 @@ export default class ApplicationRoute extends Route { * Add window frame config on controller. */ async setupController(controller) { - controller.set('isMacOS', await this.ipc.invoke('isMacOS')); - controller.set('isFrameless', await this.ipc.invoke('isFrameless')); + controller.set('hasMacOSChrome', await this.ipc.invoke('hasMacOSChrome')); + controller.set( + 'isWindowChromeless', + await this.ipc.invoke('isWindowChromeless') + ); } // =actions diff --git a/ui/desktop/app/templates/application.hbs b/ui/desktop/app/templates/application.hbs index e4cf86c72..c57622e33 100644 --- a/ui/desktop/app/templates/application.hbs +++ b/ui/desktop/app/templates/application.hbs @@ -1,14 +1,14 @@ {{page-title (app-name)}} @@ -19,7 +19,7 @@ {{/if}} - {{#if this.isFrameless}} + {{#if this.isWindowChromeless}} { Menu.setApplicationMenu(menuTemplate); /** - * Enable electron OS frame for MacOS only. - * Disable frame regardless of OS using `BYPASS_OS_SHELL` + * Enable electron OS window frame/chrome for MacOS only. + * Disable frame/chrome regardless of OS when `DISABLE_WINDOW_CHROME` is set. */ - let showFrame = isMac(); - if (process.env.BYPASS_OS_SHELL) showFrame = false; + let showWindowChrome = isMac(); + if (process.env.DISABLE_WINDOW_CHROME) showWindowChrome = false; const browserWindowOptions = { width: 1280, height: 760, - frame: showFrame, - titleBarStyle: showFrame ? 'hiddenInset' : 'none', + frame: showWindowChrome, + titleBarStyle: showWindowChrome ? 'hiddenInset' : 'none', webPreferences: { partition, sandbox: true, diff --git a/ui/desktop/electron-app/src/ipc/handlers.js b/ui/desktop/electron-app/src/ipc/handlers.js index c5e795e99..02780d834 100644 --- a/ui/desktop/electron-app/src/ipc/handlers.js +++ b/ui/desktop/electron-app/src/ipc/handlers.js @@ -69,16 +69,18 @@ handle('connect', ({ target_id, token, host_id }) => handle('stop', ({ session_id }) => sessionManager.stopById(session_id)); /** - * Check for frameless window state. Only MacOS uses default OS frame. - * Frameless window disables OS window actions (minimize, fullscreen, close). - * Enable `BYPASS_OS_SHELL` to bypass OS verification for frame. + * Check frame/chrome state. Only enabled on non-MacOS. */ -handle('isFrameless', () => !isMac() || process.env.BYPASS_OS_SHELL); +handle('isWindowChromeless', () => + process.env.DISABLE_WINDOW_CHROME ? false : !isMac() +); /** - * Check for MacOS + * Check for MacOS chrome */ -handle('isMacOS', () => isMac()); +handle('hasMacOSChrome', () => + process.env.DISABLE_WINDOW_CHROME ? false : isMac() +); /** * Minimize window diff --git a/ui/desktop/tests/acceptance/application-test.js b/ui/desktop/tests/acceptance/application-test.js index 4f9cabdee..bb0431529 100644 --- a/ui/desktop/tests/acceptance/application-test.js +++ b/ui/desktop/tests/acceptance/application-test.js @@ -47,31 +47,41 @@ module('Acceptance | origin', function (hooks) { sinon.restore(); }); - test('visiting index on MacOS hides custom window actions', async function (assert) { - assert.expect(4); - stubs.ipcService.withArgs('isMacOS').returns(true); - stubs.ipcService.withArgs('isFrameless').returns(false); + test('visiting index with chrome disabled hides custom window actions', async function (assert) { + assert.expect(3); + stubs.ipcService.withArgs('isWindowChromeless').returns(false); await visit(urls.origin); assert.notOk(find('.button-window-close'), 'Window close button'); assert.notOk(find('.button-window-minimize'), 'Window minimize button'); assert.notOk(find('.button-window-fullscreen'), 'Window fullscreen button'); + }); + + test('visiting index with chrome enabled shows custom window actions', async function (assert) { + assert.expect(3); + stubs.ipcService.withArgs('isWindowChromeless').returns(true); + await visit(urls.origin); + assert.ok(find('.button-window-close'), 'Window close button'); + assert.ok(find('.button-window-minimize'), 'Window minimize button'); + assert.ok(find('.button-window-fullscreen'), 'Window fullscreen button'); + }); + + test('visiting index with MacOS chrome enabled', async function (assert) { + assert.expect(1); + stubs.ipcService.withArgs('hasMacOSChrome').returns(true); + await visit(urls.origin); assert.ok( find('.rose-header.header-cushion'), 'Adds header padding around native window actions' ); }); - test('visiting index on non-MacOS shows custom window actions', async function (assert) { - assert.expect(4); - stubs.ipcService.withArgs('isMacOS').returns(false); - stubs.ipcService.withArgs('isFrameless').returns(true); + test('visiting index with MacOS chrome disabled', async function (assert) { + assert.expect(1); + stubs.ipcService.withArgs('hasMacOSChrome').returns(false); await visit(urls.origin); - assert.ok(find('.button-window-close'), 'Window close button'); - assert.ok(find('.button-window-minimize'), 'Window minimize button'); - assert.ok(find('.button-window-fullscreen'), 'Window fullscreen button'); assert.notOk( find('.rose-header.header-cushion'), - 'Disables header padding around native window actions' + 'Does not add header padding around native window actions' ); }); }); diff --git a/ui/desktop/tests/helpers/window-mock-ipc.js b/ui/desktop/tests/helpers/window-mock-ipc.js index bb9214b15..22910f249 100644 --- a/ui/desktop/tests/helpers/window-mock-ipc.js +++ b/ui/desktop/tests/helpers/window-mock-ipc.js @@ -17,8 +17,8 @@ class MockIPC { } resetOrigin() {} - isMacOS() {} - isFrameless() {} + hasMacOSChrome() {} + isWindowChromeless() {} } /** From 52b5a06755c427348d1b77409294b6b3f166b161 Mon Sep 17 00:00:00 2001 From: Susmitha Girumala Date: Wed, 22 Sep 2021 17:10:40 -0400 Subject: [PATCH 5/6] chore: Refactor custom desktop window actions check --- addons/api/mirage/scenarios/ipc.js | 4 ++-- ui/desktop/app/routes/application.js | 4 ++-- ui/desktop/app/templates/application.hbs | 4 ++-- ui/desktop/electron-app/src/ipc/handlers.js | 21 ++++++++++++------- .../tests/acceptance/application-test.js | 4 ++-- ui/desktop/tests/helpers/window-mock-ipc.js | 2 +- 6 files changed, 22 insertions(+), 17 deletions(-) diff --git a/addons/api/mirage/scenarios/ipc.js b/addons/api/mirage/scenarios/ipc.js index 36846194d..6e44988e4 100644 --- a/addons/api/mirage/scenarios/ipc.js +++ b/addons/api/mirage/scenarios/ipc.js @@ -129,8 +129,8 @@ export default function initializeMockIPC(server) { /** * Check for OS chrome state */ - isWindowChromeless() { - return false; + showWindowActions() { + return true; } /** diff --git a/ui/desktop/app/routes/application.js b/ui/desktop/app/routes/application.js index 20719a9d3..a52baa954 100644 --- a/ui/desktop/app/routes/application.js +++ b/ui/desktop/app/routes/application.js @@ -36,8 +36,8 @@ export default class ApplicationRoute extends Route { async setupController(controller) { controller.set('hasMacOSChrome', await this.ipc.invoke('hasMacOSChrome')); controller.set( - 'isWindowChromeless', - await this.ipc.invoke('isWindowChromeless') + 'showWindowActions', + await this.ipc.invoke('showWindowActions') ); } diff --git a/ui/desktop/app/templates/application.hbs b/ui/desktop/app/templates/application.hbs index abc20d4b0..959fb2b05 100644 --- a/ui/desktop/app/templates/application.hbs +++ b/ui/desktop/app/templates/application.hbs @@ -1,7 +1,7 @@ {{page-title (app-name)}} @@ -19,7 +19,7 @@ {{/if}} - {{#if this.isWindowChromeless}} + {{#if this.showWindowActions}} handle('stop', ({ session_id }) => sessionManager.stopById(session_id)); /** - * Check frame/chrome state. Only enabled on non-MacOS. - */ -handle('isWindowChromeless', () => - process.env.DISABLE_WINDOW_CHROME ? false : !isMac() -); - -/** - * Check for MacOS chrome + * Check for OS window chrome. Enabled on MacOS only. + * Window chrome is disabled regardless of platform when + * `DISABLE_WINDOW_CHROME` env var is enabled. */ handle('hasMacOSChrome', () => process.env.DISABLE_WINDOW_CHROME ? false : isMac() ); +/** + * Show window actions for non-MacOS platforms. + * Window actions are disabled regardless of platform when + * `DISABLE_WINDOW_CHROME` env var is enabled. + */ +handle( + 'showWindowActions', + () => !isMac() || process.env.DISABLE_WINDOW_CHROME +); + /** * Minimize window */ diff --git a/ui/desktop/tests/acceptance/application-test.js b/ui/desktop/tests/acceptance/application-test.js index bb0431529..0cf4c0837 100644 --- a/ui/desktop/tests/acceptance/application-test.js +++ b/ui/desktop/tests/acceptance/application-test.js @@ -49,7 +49,7 @@ module('Acceptance | origin', function (hooks) { test('visiting index with chrome disabled hides custom window actions', async function (assert) { assert.expect(3); - stubs.ipcService.withArgs('isWindowChromeless').returns(false); + stubs.ipcService.withArgs('showWindowActions').returns(false); await visit(urls.origin); assert.notOk(find('.button-window-close'), 'Window close button'); assert.notOk(find('.button-window-minimize'), 'Window minimize button'); @@ -58,7 +58,7 @@ module('Acceptance | origin', function (hooks) { test('visiting index with chrome enabled shows custom window actions', async function (assert) { assert.expect(3); - stubs.ipcService.withArgs('isWindowChromeless').returns(true); + stubs.ipcService.withArgs('showWindowActions').returns(true); await visit(urls.origin); assert.ok(find('.button-window-close'), 'Window close button'); assert.ok(find('.button-window-minimize'), 'Window minimize button'); diff --git a/ui/desktop/tests/helpers/window-mock-ipc.js b/ui/desktop/tests/helpers/window-mock-ipc.js index 22910f249..ac05e8a78 100644 --- a/ui/desktop/tests/helpers/window-mock-ipc.js +++ b/ui/desktop/tests/helpers/window-mock-ipc.js @@ -18,7 +18,7 @@ class MockIPC { resetOrigin() {} hasMacOSChrome() {} - isWindowChromeless() {} + showWindowActions() {} } /** From f987b908fc0dfb0261a87b583a02b31ff64da2ec Mon Sep 17 00:00:00 2001 From: Susmitha Girumala Date: Thu, 23 Sep 2021 21:08:21 -0400 Subject: [PATCH 6/6] fix: Use DISABLE_WINDOW_CHROME check before platform -desktop --- ui/desktop/electron-app/src/index.js | 3 ++- ui/desktop/electron-app/src/ipc/handlers.js | 13 ++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ui/desktop/electron-app/src/index.js b/ui/desktop/electron-app/src/index.js index 6fdf81578..61d9a2c57 100644 --- a/ui/desktop/electron-app/src/index.js +++ b/ui/desktop/electron-app/src/index.js @@ -115,7 +115,8 @@ app.on('ready', async () => { /** * Enable electron OS window frame/chrome for MacOS only. - * Disable frame/chrome regardless of OS when `DISABLE_WINDOW_CHROME` is set. + * Disable frame/chrome regardless of OS when + * `DISABLE_WINDOW_CHROME=true`. */ let showWindowChrome = isMac(); if (process.env.DISABLE_WINDOW_CHROME) showWindowChrome = false; diff --git a/ui/desktop/electron-app/src/ipc/handlers.js b/ui/desktop/electron-app/src/ipc/handlers.js index 3d3ba3b4a..599e9c765 100644 --- a/ui/desktop/electron-app/src/ipc/handlers.js +++ b/ui/desktop/electron-app/src/ipc/handlers.js @@ -70,8 +70,8 @@ handle('stop', ({ session_id }) => sessionManager.stopById(session_id)); /** * Check for OS window chrome. Enabled on MacOS only. - * Window chrome is disabled regardless of platform when - * `DISABLE_WINDOW_CHROME` env var is enabled. + * Window chrome is disabled regardless of platform for + * `DISABLE_WINDOW_CHROME=true`. */ handle('hasMacOSChrome', () => process.env.DISABLE_WINDOW_CHROME ? false : isMac() @@ -79,12 +79,11 @@ handle('hasMacOSChrome', () => /** * Show window actions for non-MacOS platforms. - * Window actions are disabled regardless of platform when - * `DISABLE_WINDOW_CHROME` env var is enabled. + * Window actions are disabled regardless of platform for + * `DISABLE_WINDOW_CHROME=true`. */ -handle( - 'showWindowActions', - () => !isMac() || process.env.DISABLE_WINDOW_CHROME +handle('showWindowActions', () => + process.env.DISABLE_WINDOW_CHROME ? false : !isMac() ); /**