From c1cd762da4d9785874caa553c5b7234537e54e0b Mon Sep 17 00:00:00 2001 From: Susmitha Girumala Date: Mon, 24 May 2021 16:37:35 -0400 Subject: [PATCH] chore: Make windows electron shell frameless --- ui/desktop/app/styles/app.scss | 6 ++++++ ui/desktop/app/templates/application.hbs | 5 +++++ ui/desktop/electron-app/src/index.js | 3 ++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ui/desktop/app/styles/app.scss b/ui/desktop/app/styles/app.scss index 70706535e..0ff3fd9b0 100644 --- a/ui/desktop/app/styles/app.scss +++ b/ui/desktop/app/styles/app.scss @@ -120,6 +120,8 @@ .rose-header { -webkit-app-region: drag; + // Disable text selection to avoid text copy + -webkit-user-select: none; min-height: sizing.rems(l) * 2; padding-left: sizing.rems(l) * 3; position: relative; @@ -134,6 +136,10 @@ } } + .rose-icon { + color: var(--subtle); + } + &.loading { &::after { animation: gradient 1s linear infinite; diff --git a/ui/desktop/app/templates/application.hbs b/ui/desktop/app/templates/application.hbs index 6407a15d2..c8fd320d4 100644 --- a/ui/desktop/app/templates/application.hbs +++ b/ui/desktop/app/templates/application.hbs @@ -54,6 +54,11 @@ {{/if}} + + + + + diff --git a/ui/desktop/electron-app/src/index.js b/ui/desktop/electron-app/src/index.js index 1f220eb85..d1b7e8cd4 100644 --- a/ui/desktop/electron-app/src/index.js +++ b/ui/desktop/electron-app/src/index.js @@ -21,6 +21,7 @@ const sessionManager = require('./services/session-manager.js'); const menu = require('./config/menu.js'); const appUpdater = require('./helpers/app-updater.js'); +const { isWindows } = require('./helpers/platform.js'); const isDev = require('electron-is-dev'); // Register the custom file protocol @@ -114,7 +115,7 @@ app.on('ready', async () => { mainWindow = new BrowserWindow({ width: 1280, height: 760, - titleBarStyle: 'hiddenInset', + frame: !isWindows(), webPreferences: { partition, sandbox: true,