MrUnknownDE/VRCX
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/VRCX.git synced 2026-04-19 06:43:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix CJK fonts

Browse Source
This commit is contained in:
pa
2025-09-14 15:21:44 +09:00
committed by Natsumi
parent b0f0896dae
commit 875459689f
27 changed files with 330 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/vr/Vr.vue
View File

@@ -1207,37 +1207,40 @@
<template v-if="nowPlaying.playing">
<span style="float: right; padding-left: 10px">{{ nowPlaying.remainingText }}</span>
<MarqueeText>{{ nowPlaying.name }}</MarqueeText>
<div class="np-progress-bar" style="margin-left: 5px" :style="{ width: nowPlaying.percentage + '%' }"></div>
<div
class="np-progress-bar"
style="margin-left: 5px"
:style="{ width: nowPlaying.percentage + '%' }"></div>
</template>
<div style="float: right"
>
<div style="float: right">
<span v-if="!config?.minimalFeed" style="display: inline-block">{{ t('vr.status.timer') }}</span>
<span v-if="lastLocationTimer" style="display: inline-block">{{ lastLocationTimer }}</span>
<span v-if="lastLocationTimer && (onlineForTimer || pcUptime)" style="display: inline-block"> | </span>
<span v-if="onlineForTimer" style="display: inline-block; margin-left: 5px">{{ onlineForTimer }}</span>
<span v-if="lastLocationTimer && (onlineForTimer || pcUptime)" style="display: inline-block">
|
</span>
<span v-if="onlineForTimer" style="display: inline-block; margin-left: 5px">{{
onlineForTimer
}}</span>
<span v-if="pcUptime && onlineForTimer" style="display: inline-block; margin-left: 5px"> | </span>
<span v-if="pcUptime" style="display: inline-block; margin-left: 5px">{{ pcUptime }}</span>
</div>
<template v-if="lastLocation.playerList.length">
<span v-if="!config?.minimalFeed" style="display: inline-block"
>{{ t('vr.status.players') }}</span
>
<span style="display: inline-block"
>{{ lastLocation.playerList.length }}</span>
<span v-if="!config?.minimalFeed" style="display: inline-block">{{ t('vr.status.players') }}</span>
<span style="display: inline-block">{{ lastLocation.playerList.length }}</span>
</template>
<span v-if="lastLocation.friendList.length" style="display: inline-block; font-weight: bold; margin-left: 5px">({{lastLocation.friendList.length}})</span>
<span
v-if="lastLocation.friendList.length"
style="display: inline-block; font-weight: bold; margin-left: 5px"
>({{ lastLocation.friendList.length }})</span
>
<!-- Bottom row -->
<br />
<span style="position: absolute; right: 10px">{{ currentTime }}</span>
<span v-if="config && cpuUsageEnabled" style="display: inline-block; margin-right: 5px"
>{{ t('vr.status.cpu') }} {{ cpuUsage }}%</span
>
<span style="display: inline-block"
>{{ t('vr.status.online') }} {{ onlineFriendCount }}</span
>
<span style="display: inline-block; margin-left: 5px"
>{{ customInfo }}</span
>
<span style="display: inline-block">{{ t('vr.status.online') }} {{ onlineFriendCount }}</span>
<span style="display: inline-block; margin-left: 5px">{{ customInfo }}</span>
</div>
</template>
<!-- HMD Overlay -->
@@ -1368,10 +1371,6 @@
<script setup>
import './vr.scss';
import '@fontsource/noto-sans-kr';
import '@fontsource/noto-sans-jp';
import '@fontsource/noto-sans-sc';
import '@fontsource/noto-sans-tc';
import { onMounted, reactive, toRefs, nextTick } from 'vue';
import Noty from 'noty';
import * as workerTimers from 'worker-timers';
@@ -1381,6 +1380,7 @@
import { escapeTag, escapeTagRecursive } from '../shared/utils/base/string';
import { removeFromArray } from '../shared/utils/base/array';
import { timeToText } from '../shared/utils/base/format';
import { changeHtmlLangAttribute } from '../shared/utils/base/ui';
import { useI18n } from 'vue-i18n';
@@ -1974,7 +1974,8 @@
}
if (appLanguage !== vrState.appLanguage) {
vrState.appLanguage = appLanguage;
// @ts-ignore
changeHtmlLangAttribute(vrState.appLanguage);
//@ts-ignore
i18n.locale = vrState.appLanguage;
}
}
@@ -2020,4 +2021,4 @@
.ml-5 {
margin-left: 5px;
}
</style>
</style>

32
src/vr/vr.scss
View File

@@ -29,6 +29,38 @@ body {
margin: 0;
}
html[lang='ja'] body,
html[lang='ja'] * {
font-family:
'ellipsis-font', 'Noto Sans JP', 'Noto Sans KR', 'Noto Sans TC',
'Noto Sans SC', 'Meiryo UI', 'Malgun Gothic', 'Segoe UI', system-ui,
sans-serif;
}
html[lang='ko'] body,
html[lang='ko'] * {
font-family:
'ellipsis-font', 'Noto Sans KR', 'Noto Sans JP', 'Noto Sans TC',
'Noto Sans SC', 'Meiryo UI', 'Malgun Gothic', 'Segoe UI', system-ui,
sans-serif;
}
html[lang='zh-CN'] body,
html[lang='zh-CN'] * {
font-family:
'ellipsis-font', 'Noto Sans SC', 'Noto Sans TC', 'Noto Sans JP',
'Noto Sans KR', 'Meiryo UI', 'Malgun Gothic', 'Segoe UI', system-ui,
sans-serif;
}
html[lang='zh-TW'] body,
html[lang='zh-TW'] * {
font-family:
'ellipsis-font', 'Noto Sans TC', 'Noto Sans SC', 'Noto Sans JP',
'Noto Sans KR', 'Meiryo UI', 'Malgun Gothic', 'Segoe UI', system-ui,
sans-serif;
}
.noty_body {
display: block;
}