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(() => {
-
+
@@ -95,10 +95,18 @@ onUnmounted(() => { height: 100%; /* Save space for native title bar buttons */ x-margin-inline-start: env(titlebar-area-x, 0); - margin-inline-start: 300px; + margin-inline-start: calc(300px - 1px); background-color: var(--color-main-background-macos); x-width: env(titlebar-area-width, 100%); - width: calc(100% - 300px); + width: calc(100% - 300px + 1); + border-inline-start: 1px solid var(--color-border-macos); + border-block-end: 1px solid var(--color-border-macos); + transition: margin-inline-start var(--animation-quick) ease; +} + +body:has(#app-navigation-vue[aria-hidden="true"]) .header__inner { + margin-inline-start: 0; + border-inline-start: none; } .header__item { diff --git a/src/talk/renderer/Settings/DesktopSettingsSection.vue b/src/talk/renderer/Settings/DesktopSettingsSection.vue index 1f6197b2..096d215d 100644 --- a/src/talk/renderer/Settings/DesktopSettingsSection.vue +++ b/src/talk/renderer/Settings/DesktopSettingsSection.vue @@ -79,26 +79,6 @@ const playSoundCallOption = useNcSelectModel(playSoundCall, generalNotificationO const enableCallbox = useAppConfigValue('enableCallbox') const enableCallboxOption = useNcSelectModel(enableCallbox, generalNotificationOptions) -const vibrancy = useAppConfigValue('vibrancy') -const vibrancyOptions = [ - { label: 'null', value: null }, - { label: 'titlebar', value: 'titlebar' }, - { label: 'selection', value: 'selection' }, - { label: 'menu', value: 'menu' }, - { label: 'popover', value: 'popover' }, - { label: 'sidebar', value: 'sidebar' }, - { label: 'header', value: 'header' }, - { label: 'sheet', value: 'sheet' }, - { label: 'window', value: 'window' }, - { label: 'hud', value: 'hud' }, - { label: 'fullscreen-ui', value: 'fullscreen-ui' }, - { label: 'tooltip', value: 'tooltip' }, - { label: 'content', value: 'content' }, - { label: 'under-window', value: 'under-window' }, - { label: 'under-page', value: 'under-page' }, -] -const vibrancyOption = useNcSelectModel(vibrancy, vibrancyOptions) - /** * Restart the app */ @@ -121,8 +101,6 @@ function relaunch() {
- - {{ 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