Skip to content

fix: always hide custom window decorations on linux #6076

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Prospector wants to merge 1 commit into from
Closed

fix: always hide custom window decorations on linux #6076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions apps/app-frontend/src/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,6 @@ window.addEventListener('online', () => {
})

const showOnboarding = ref(false)
const nativeDecorations = ref(false)

const os = ref('')
const isDevEnvironment = ref(false)
Expand Down Expand Up @@ -330,8 +329,9 @@ async function setupApp() {
const version = await getVersion()
showOnboarding.value = !onboarded

nativeDecorations.value = native_decorations
if (os.value !== 'MacOS') await getCurrentWindow().setDecorations(native_decorations)
if (os.value !== 'MacOS' && os.value !== 'Linux') {
await getCurrentWindow().setDecorations(native_decorations)
}

themeStore.setThemeState(theme)
themeStore.collapsedNavigation = collapsed_navigation
Expand Down
4 changes: 2 additions & 2 deletions apps/app-frontend/src/components/ui/WindowControls.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ const alwaysShowAppControls = computed(() => themeStore.getFeatureFlag('always_s
const showControls = computed(
() =>
alwaysShowAppControls.value ||
(!nativeDecorations.value && (os.value === 'Windows' || os.value === 'Linux')),
(!nativeDecorations.value && os.value !== 'MacOS' && os.value !== 'Linux'),
)

onMounted(async () => {
Expand All @@ -60,7 +60,7 @@ onMounted(async () => {
const settings = await getSettings()
nativeDecorations.value = settings.native_decorations

if (os.value !== 'MacOS') {
if (os.value !== 'MacOS' && os.value !== 'Linux') {
await getCurrentWindow().setDecorations(nativeDecorations.value)
}

Expand Down
2 changes: 1 addition & 1 deletion apps/app-frontend/src/components/ui/settings/AppearanceSettings.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ watch(
<Toggle id="hide-nametag-skins-page" v-model="settings.hide_nametag_skins_page" />
</div>

<div v-if="os !== 'MacOS'" class="mt-6 flex items-center justify-between gap-4">
<div v-if="os !== 'MacOS' && os !== 'Linux'" class="mt-6 flex items-center justify-between gap-4">
<div>
<h2 class="m-0 text-lg font-semibold text-contrast">
{{ formatMessage(messages.nativeDecorationsTitle) }}
Expand Down
Loading