Skip to content

Commit 96edc7c

Browse files
authored
fix(stage-tamagotchi): desktop chat window not respective dark theme (#744)
1 parent 9ceb7fc commit 96edc7c

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

apps/stage-tamagotchi/src/renderer/App.vue

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,34 @@ import { defineInvoke, defineInvokeHandler } from '@moeru/eventa'
33
import { useDisplayModelsStore } from '@proj-airi/stage-ui/stores/display-models'
44
import { useOnboardingStore } from '@proj-airi/stage-ui/stores/onboarding'
55
import { useSettings } from '@proj-airi/stage-ui/stores/settings'
6+
import { useDark } from '@vueuse/core'
67
import { storeToRefs } from 'pinia'
78
import { onMounted, watch } from 'vue'
89
import { useI18n } from 'vue-i18n'
9-
import { RouterView, useRouter } from 'vue-router'
10+
import { RouterView, useRoute, useRouter } from 'vue-router'
1011
1112
import { electronOpenSettings, electronStartTrackMousePosition } from '../shared/eventa'
1213
import { useElectronEventaContext } from './composables/electron-vueuse'
14+
import { themeColorFromValue, useThemeColor } from './composables/theme-color'
1315
16+
const dark = useDark({ disableTransition: false })
1417
const i18n = useI18n()
1518
const displayModelsStore = useDisplayModelsStore()
1619
const settingsStore = useSettings()
1720
const { language, themeColorsHue, themeColorsHueDynamic } = storeToRefs(settingsStore)
1821
const onboardingStore = useOnboardingStore()
1922
const router = useRouter()
23+
const route = useRoute()
2024
2125
watch(language, () => {
2226
i18n.locale.value = language.value
2327
})
2428
29+
const { updateThemeColor } = useThemeColor(themeColorFromValue({ light: 'rgb(255 255 255)', dark: 'rgb(18 18 18)' }))
30+
watch(dark, () => updateThemeColor(), { immediate: true })
31+
watch(route, () => updateThemeColor(), { immediate: true })
32+
onMounted(() => updateThemeColor())
33+
2534
// FIXME: store settings to file
2635
onMounted(async () => {
2736
onboardingStore.initializeSetupCheck()

apps/stage-tamagotchi/src/renderer/layouts/settings.vue

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
11
<script setup lang="ts">
22
import { PageHeader } from '@proj-airi/stage-ui/components'
33
import { useProvidersStore } from '@proj-airi/stage-ui/stores/providers'
4-
import { useDark } from '@vueuse/core'
54
import { storeToRefs } from 'pinia'
6-
import { computed, onMounted, watch } from 'vue'
5+
import { computed } from 'vue'
76
import { useI18n } from 'vue-i18n'
87
import { RouterView, useRoute } from 'vue-router'
98
109
import WindowTitleBar from '../components/Window/TitleBar.vue'
1110
12-
import { themeColorFromValue, useThemeColor } from '../composables/theme-color'
13-
1411
const route = useRoute()
15-
const dark = useDark()
1612
const { t } = useI18n()
1713
const providersStore = useProvidersStore()
1814
const { allProvidersMetadata } = storeToRefs(providersStore)
@@ -128,11 +124,6 @@ const routeHeaderMetadataMap = computed(() => {
128124
const routeHeaderMetadata = computed(() => {
129125
return routeHeaderMetadataMap.value[route.path] || routeHeaderMetadataMap.value[`${route.path}/`]
130126
})
131-
132-
const { updateThemeColor } = useThemeColor(themeColorFromValue({ light: 'rgb(255 255 255)', dark: 'rgb(18 18 18)' }))
133-
watch(dark, () => updateThemeColor(), { immediate: true })
134-
watch(route, () => updateThemeColor(), { immediate: true })
135-
onMounted(() => updateThemeColor())
136127
</script>
137128

138129
<template>

0 commit comments

Comments
 (0)