From a19c1535e83d362be7182621ebb62770883b3378 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Thu, 15 Apr 2021 23:27:28 +0900
Subject: [PATCH] =?UTF-8?q?=E3=82=BF=E3=82=A4=E3=83=88=E3=83=AB=E3=83=90?=
 =?UTF-8?q?=E3=83=BC=E9=9D=9E=E8=A1=A8=E7=A4=BA=E3=82=AA=E3=83=97=E3=82=B7?=
 =?UTF-8?q?=E3=83=A7=E3=83=B3=E5=89=8A=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/client/pages/settings/general.vue | 6 ------
 src/client/store.ts                   | 4 ----
 src/client/ui/default.vue             | 2 +-
 src/client/ui/universal.vue           | 9 +++------
 4 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/src/client/pages/settings/general.vue b/src/client/pages/settings/general.vue
index 7e80e2249f..2963ddf432 100644
--- a/src/client/pages/settings/general.vue
+++ b/src/client/pages/settings/general.vue
@@ -1,6 +1,5 @@
 <template>
 <FormBase>
-	<FormSwitch v-model:value="titlebar">{{ $ts.showTitlebar }}</FormSwitch>
 	<FormSwitch v-model:value="showFixedPostForm">{{ $ts.showFixedPostForm }}</FormSwitch>
 
 	<FormSelect v-model:value="lang">
@@ -137,7 +136,6 @@ export default defineComponent({
 		useOsNativeEmojis: defaultStore.makeGetterSetter('useOsNativeEmojis'),
 		disableShowingAnimatedImages: defaultStore.makeGetterSetter('disableShowingAnimatedImages'),
 		loadRawImages: defaultStore.makeGetterSetter('loadRawImages'),
-		titlebar: defaultStore.makeGetterSetter('titlebar'),
 		imageNewTab: defaultStore.makeGetterSetter('imageNewTab'),
 		nsfw: defaultStore.makeGetterSetter('nsfw'),
 		disablePagesScript: defaultStore.makeGetterSetter('disablePagesScript'),
@@ -182,10 +180,6 @@ export default defineComponent({
 			this.reloadAsk();
 		},
 
-		titlebar() {
-			this.reloadAsk();
-		},
-
 		instanceTicker() {
 			this.reloadAsk();
 		},
diff --git a/src/client/store.ts b/src/client/store.ts
index cdc244537f..0d34a02364 100644
--- a/src/client/store.ts
+++ b/src/client/store.ts
@@ -184,10 +184,6 @@ export const defaultStore = markRaw(new Storage('base', {
 		where: 'device',
 		default: 'full' as 'full' | 'icon'
 	},
-	titlebar: {
-		where: 'device',
-		default: true
-	},
 	reportError: {
 		where: 'device',
 		default: false
diff --git a/src/client/ui/default.vue b/src/client/ui/default.vue
index ec59bf0039..1745f1f3d4 100644
--- a/src/client/ui/default.vue
+++ b/src/client/ui/default.vue
@@ -6,7 +6,7 @@
 		</div>
 
 		<main class="main _panel" @contextmenu.stop="onContextmenu">
-			<header v-if="$store.state.titlebar" class="header" @click="onHeaderClick">
+			<header class="header" @click="onHeaderClick">
 				<XHeader :info="pageInfo"/>
 			</header>
 			<div class="content" :class="{ _flat_: !fullView }">
diff --git a/src/client/ui/universal.vue b/src/client/ui/universal.vue
index 3e2ee28817..6df09937df 100644
--- a/src/client/ui/universal.vue
+++ b/src/client/ui/universal.vue
@@ -2,8 +2,8 @@
 <div class="mk-app" :class="{ wallpaper }">
 	<XSidebar ref="nav" class="sidebar"/>
 
-	<div class="contents" ref="contents" :class="{ withHeader: $store.state.titlebar }" @contextmenu.stop="onContextmenu">
-		<header v-if="$store.state.titlebar" class="header" ref="header" @click="onHeaderClick">
+	<div class="contents" ref="contents" @contextmenu.stop="onContextmenu">
+		<header class="header" ref="header" @click="onHeaderClick">
 			<XHeader :info="pageInfo"/>
 		</header>
 		<main ref="main">
@@ -260,10 +260,7 @@ export default defineComponent({
 		width: 100%;
 		min-width: 0;
 		--stickyTop: #{$header-height};
-
-		&.withHeader {
-			padding-top: $header-height;
-		}
+		padding-top: $header-height;
 
 		> .header {
 			position: fixed;