Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	theseus_gui/package.json
#	theseus_gui/src-tauri/tauri.conf.json
#	theseus_gui/src/components/ui/AccountsCard.vue
  • Loading branch information
DIDIRUS4 committed Dec 13, 2023
2 parents b680a28 + 08ff7a4 commit af1ff09
Showing 1 changed file with 3 additions and 9 deletions.
12 changes: 3 additions & 9 deletions theseus_gui/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,8 @@ const os = ref('')
defineExpose({
initialize: async () => {
isLoading.value = false
const {
native_decorations,
theme,
opt_out_analytics,
collapsed_navigation,
advanced_rendering,
fully_onboarded,
} = await get()
const { native_decorations, theme, opt_out_analytics, collapsed_navigation, advanced_rendering, fully_onboarded } =
await get()
// video should play if the user is not on linux, and has not onboarded
os.value = await getOS()
videoPlaying.value = !fully_onboarded && os.value !== 'Linux'
Expand All @@ -77,7 +71,7 @@ defineExpose({
showOnboarding.value = !fully_onboarded
nativeDecorations.value = native_decorations
if (os.value !== 'MacOS') appWindow.setDecorations(native_decorations)
if (os.value !== "MacOS") appWindow.setDecorations(native_decorations)
themeStore.setThemeState(theme)
themeStore.collapsedNavigation = collapsed_navigation
Expand Down

0 comments on commit af1ff09

Please sign in to comment.