wip (#8077)
This commit is contained in:
		
							parent
							
								
									a3dceee7c0
								
							
						
					
					
						commit
						dc0e55bf16
					
				
					 4 changed files with 9 additions and 1 deletions
				
			
		|  | @ -448,6 +448,7 @@ uiLanguage: "UIの表示言語" | ||||||
| groupInvited: "グループに招待されました" | groupInvited: "グループに招待されました" | ||||||
| aboutX: "{x}について" | aboutX: "{x}について" | ||||||
| useOsNativeEmojis: "OSネイティブの絵文字を使用" | useOsNativeEmojis: "OSネイティブの絵文字を使用" | ||||||
|  | disableDrawer: "メニューをドロワーで表示しない" | ||||||
| youHaveNoGroups: "グループがありません" | youHaveNoGroups: "グループがありません" | ||||||
| joinOrCreateGroup: "既存のグループに招待してもらうか、新しくグループを作成してください。" | joinOrCreateGroup: "既存のグループに招待してもらうか、新しくグループを作成してください。" | ||||||
| noHistory: "履歴はありません" | noHistory: "履歴はありません" | ||||||
|  |  | ||||||
|  | @ -13,6 +13,7 @@ | ||||||
| import { defineComponent, nextTick, onMounted, computed, PropType, ref, watch } from 'vue'; | import { defineComponent, nextTick, onMounted, computed, PropType, ref, watch } from 'vue'; | ||||||
| import * as os from '@/os'; | import * as os from '@/os'; | ||||||
| import { isTouchUsing } from '@/scripts/touch'; | import { isTouchUsing } from '@/scripts/touch'; | ||||||
|  | import { defaultStore } from '@/store'; | ||||||
| 
 | 
 | ||||||
| function getFixedContainer(el: Element | null): Element | null { | function getFixedContainer(el: Element | null): Element | null { | ||||||
| 	if (el == null || el.tagName === 'BODY') return null; | 	if (el == null || el.tagName === 'BODY') return null; | ||||||
|  | @ -77,7 +78,7 @@ export default defineComponent({ | ||||||
| 		const zIndex = os.claimZIndex(props.zPriority); | 		const zIndex = os.claimZIndex(props.zPriority); | ||||||
| 		const type = computed(() => { | 		const type = computed(() => { | ||||||
| 			if (props.preferType === 'auto') { | 			if (props.preferType === 'auto') { | ||||||
| 				if (isTouchUsing && window.innerWidth < 500 && window.innerHeight < 1000) { | 				if (!defaultStore.state.disableDrawer && isTouchUsing && window.innerWidth < 500 && window.innerHeight < 1000) { | ||||||
| 					return 'drawer'; | 					return 'drawer'; | ||||||
| 				} else { | 				} else { | ||||||
| 					return props.src != null ? 'popup' : 'dialog'; | 					return props.src != null ? 'popup' : 'dialog'; | ||||||
|  |  | ||||||
|  | @ -43,6 +43,7 @@ | ||||||
| 		<FormSwitch v-model="useOsNativeEmojis" class="_formBlock">{{ $ts.useOsNativeEmojis }} | 		<FormSwitch v-model="useOsNativeEmojis" class="_formBlock">{{ $ts.useOsNativeEmojis }} | ||||||
| 			<div><Mfm :key="useOsNativeEmojis" text="🍮🍦🍭🍩🍰🍫🍬🥞🍪"/></div> | 			<div><Mfm :key="useOsNativeEmojis" text="🍮🍦🍭🍩🍰🍫🍬🥞🍪"/></div> | ||||||
| 		</FormSwitch> | 		</FormSwitch> | ||||||
|  | 		<FormSwitch v-model="disableDrawer" class="_formBlock">{{ $ts.disableDrawer }}</FormSwitch> | ||||||
| 
 | 
 | ||||||
| 		<FormRadios v-model="fontSize" class="_formBlock"> | 		<FormRadios v-model="fontSize" class="_formBlock"> | ||||||
| 			<template #label>{{ $ts.fontSize }}</template> | 			<template #label>{{ $ts.fontSize }}</template> | ||||||
|  | @ -140,6 +141,7 @@ export default defineComponent({ | ||||||
| 		showGapBetweenNotesInTimeline: defaultStore.makeGetterSetter('showGapBetweenNotesInTimeline'), | 		showGapBetweenNotesInTimeline: defaultStore.makeGetterSetter('showGapBetweenNotesInTimeline'), | ||||||
| 		disableAnimatedMfm: defaultStore.makeGetterSetter('animatedMfm', v => !v, v => !v), | 		disableAnimatedMfm: defaultStore.makeGetterSetter('animatedMfm', v => !v, v => !v), | ||||||
| 		useOsNativeEmojis: defaultStore.makeGetterSetter('useOsNativeEmojis'), | 		useOsNativeEmojis: defaultStore.makeGetterSetter('useOsNativeEmojis'), | ||||||
|  | 		disableDrawer: defaultStore.makeGetterSetter('disableDrawer'), | ||||||
| 		disableShowingAnimatedImages: defaultStore.makeGetterSetter('disableShowingAnimatedImages'), | 		disableShowingAnimatedImages: defaultStore.makeGetterSetter('disableShowingAnimatedImages'), | ||||||
| 		loadRawImages: defaultStore.makeGetterSetter('loadRawImages'), | 		loadRawImages: defaultStore.makeGetterSetter('loadRawImages'), | ||||||
| 		imageNewTab: defaultStore.makeGetterSetter('imageNewTab'), | 		imageNewTab: defaultStore.makeGetterSetter('imageNewTab'), | ||||||
|  |  | ||||||
|  | @ -138,6 +138,10 @@ export const defaultStore = markRaw(new Storage('base', { | ||||||
| 		where: 'device', | 		where: 'device', | ||||||
| 		default: false | 		default: false | ||||||
| 	}, | 	}, | ||||||
|  | 	disableDrawer: { | ||||||
|  | 		where: 'device', | ||||||
|  | 		default: false | ||||||
|  | 	}, | ||||||
| 	useBlurEffectForModal: { | 	useBlurEffectForModal: { | ||||||
| 		where: 'device', | 		where: 'device', | ||||||
| 		default: true | 		default: true | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue