diff --git a/src/app/AppConfig.ts b/src/app/AppConfig.ts
index 85ee54cc..e81a178c 100644
--- a/src/app/AppConfig.ts
+++ b/src/app/AppConfig.ts
@@ -31,7 +31,6 @@ function getAppConfigFilePath() {
* Stored in the application data directory.
*/
export type AppConfig = {
- vibrancy: string | null
// ----------------
// General settings
// ----------------
@@ -108,7 +107,6 @@ export type AppConfigKey = keyof AppConfig
* Get the default config
*/
const defaultAppConfig: AppConfig = {
- vibrancy: null,
launchAtStartup: false,
theme: 'default',
systemTitleBar: isLinux,
diff --git a/src/talk/renderer/DesktopHeader.vue b/src/talk/renderer/DesktopHeader.vue
index 8a543940..11279833 100644
--- a/src/talk/renderer/DesktopHeader.vue
+++ b/src/talk/renderer/DesktopHeader.vue
@@ -68,7 +68,7 @@ onUnmounted(() => {
-
-
-
{{ t('talk_desktop', 'Launch at startup') }}
diff --git a/src/talk/renderer/assets/styles.css b/src/talk/renderer/assets/styles.css
index d60941bd..0e6daeae 100644
--- a/src/talk/renderer/assets/styles.css
+++ b/src/talk/renderer/assets/styles.css
@@ -29,9 +29,22 @@ html, body {
background: none !important;
}
+@media (prefers-color-scheme: dark) {
+ :root {
+ --color-border-macos: #000000;
+ }
+}
+
+@media (prefers-color-scheme: light) {
+ :root {
+ --color-border-macos: #DCDCDC;
+ }
+}
+
.app-navigation {
background: none !important;
backdrop-filter: none !important;
+ border-inline-end: 1px solid var(--color-border-macos) !important;
}
.list-item {
@@ -46,7 +59,7 @@ html, body {
:root {
--color-primary-element-macos: rgb(from var(--color-primary-element) r g b / 0.75);
--color-primary-element-hover-macos: rgb(from var(--color-primary-element-hover) r g b / 0.75);
- --color-main-background-macos: rgb(from var(--color-main-background) r g b / 0.4);
+ --color-main-background-macos: rgb(from var(--color-main-background) r g b / 0.5);
}
diff --git a/src/talk/renderer/components/MainMenu.vue b/src/talk/renderer/components/MainMenu.vue
index ad0c418d..0c49ba06 100644
--- a/src/talk/renderer/components/MainMenu.vue
+++ b/src/talk/renderer/components/MainMenu.vue
@@ -27,6 +27,8 @@ const talkWebLink = computed(() => generateUrl(talkRouter.value?.currentRoute?.f
const showHelp = () => window.TALK_DESKTOP.showHelp()
const reload = () => window.location.reload()
const openSettings = () => window.OCA.Talk.Settings.open()
+
+const OS = window.systemInfo
@@ -34,7 +36,7 @@ const openSettings = () => window.OCA.Talk.Settings.open()
type="tertiary-no-background"
container="body">
-
+
diff --git a/src/talk/talk.window.js b/src/talk/talk.window.js
index bff058a5..9e7aee9e 100644
--- a/src/talk/talk.window.js
+++ b/src/talk/talk.window.js
@@ -13,7 +13,7 @@ const { getBrowserWindowIcon } = require('../shared/icons.utils.js')
const { TITLE_BAR_HEIGHT } = require('../constants.js')
const { getAppConfig } = require('../app/AppConfig.ts')
const { getScaledWindowMinSize, getScaledWindowSize, applyZoom } = require('../app/utils.ts')
-const {onAppConfigChange} = require('../app/AppConfig.ts')
+const {isMac} = require('../app/system.utils')
/**
* @return {import('electron').BrowserWindow}
@@ -24,13 +24,12 @@ function createTalkWindow() {
const talkWindowOptions = {
transparent: true,
frame: false,
- vibrancy: null,
-
+ vibrancy: 'sidebar',
...getScaledWindowMinSize({
minWidth: 600,
minHeight: 400,
}),
- //backgroundColor: '#00679E',
+ backgroundColor: !isMac ? '#00679E' : undefined,
autoHideMenuBar: true,
webPreferences: {
preload: TALK_WINDOW_PRELOAD_WEBPACK_ENTRY,
@@ -60,10 +59,6 @@ function createTalkWindow() {
show: false,
})
- onAppConfigChange('vibrancy', (value) => {
- window.setVibrancy(value)
- })
-
// TODO: return it on release
/*
if (process.env.NODE_ENV === 'production') {
@@ -86,6 +81,8 @@ function createTalkWindow() {
setupTray(window)
+ window.setVibrancy('sidebar')
+
window.loadURL(TALK_WINDOW_WEBPACK_ENTRY)
return window