Update Cef 125.0.210, fix PerformanceCounter bugs

This commit is contained in:
Natsumi
2024-06-15 11:53:58 +12:00
parent 2d13d97ae4
commit fe12f615ba
13 changed files with 223 additions and 153 deletions

View File

@@ -15225,8 +15225,8 @@ speechSynthesis.getVoices();
'VRCX_hideDevicesFromFeed',
false
);
$app.data.hideCpuUsageFromFeed = await configRepository.getBool(
'VRCX_hideCpuUsageFromFeed',
$app.data.vrOverlayCpuUsage = await configRepository.getBool(
'VRCX_vrOverlayCpuUsage',
false
);
$app.data.hideUptimeFromFeed = await configRepository.getBool(
@@ -15429,8 +15429,8 @@ speechSynthesis.getVoices();
this.hideDevicesFromFeed
);
await configRepository.setBool(
'VRCX_hideCpuUsageFromFeed',
this.hideCpuUsageFromFeed
'VRCX_vrOverlayCpuUsage',
this.vrOverlayCpuUsage
);
await configRepository.setBool(
'VRCX_hideUptimeFromFeed',
@@ -16155,7 +16155,7 @@ speechSynthesis.getVoices();
var VRConfigVars = {
overlayNotifications: this.overlayNotifications,
hideDevicesFromFeed: this.hideDevicesFromFeed,
hideCpuUsageFromFeed: this.hideCpuUsageFromFeed,
vrOverlayCpuUsage: this.vrOverlayCpuUsage,
minimalFeed: this.minimalFeed,
notificationPosition: this.notificationPosition,
notificationTimeout: this.notificationTimeout,

View File

@@ -374,7 +374,7 @@
"background_color": "Background Color",
"minimal_feed_icons": "Minimal Feed Icons",
"hide_vr_devices": "Hide VR Devices",
"hide_cpu_usage": "Hide CPU Usage",
"show_cpu_usage": "Show CPU Usage",
"hide_game_uptime": "Hide Game Uptime",
"show_pc_uptime": "Show PC Uptime",
"wrist_feed_filters": "Wrist Feed Filters"

View File

@@ -372,8 +372,8 @@ mixin settingsTab()
span.name {{ $t('view.settings.wrist_overlay.steamvr_wrist_overlay.hide_vr_devices') }}
el-switch(v-model="hideDevicesFromFeed" @change="saveOpenVROption" :disabled="!openVR || !overlayWrist")
div.options-container-item
span.name {{ $t('view.settings.wrist_overlay.steamvr_wrist_overlay.hide_cpu_usage') }}
el-switch(v-model="hideCpuUsageFromFeed" @change="saveOpenVROption" :disabled="!openVR || !overlayWrist")
span.name {{ $t('view.settings.wrist_overlay.steamvr_wrist_overlay.show_cpu_usage') }}
el-switch(v-model="vrOverlayCpuUsage" @change="saveOpenVROption" :disabled="!openVR || !overlayWrist")
div.options-container-item
span.name {{ $t('view.settings.wrist_overlay.steamvr_wrist_overlay.hide_game_uptime') }}
el-switch(v-model="hideUptimeFromFeed" @change="saveOpenVROption" :disabled="!openVR || !overlayWrist")

View File

@@ -194,8 +194,11 @@ Vue.component('marquee-text', MarqueeText);
// 2 = 항상 화면에 보이는 거
appType: location.href.substr(-1),
appLanguage: 'en',
currentCulture: 'en-nz',
currentTime: new Date().toJSON(),
cpuUsageEnabled: false,
cpuUsage: 0,
pcUptimeEnabled: false,
pcUptime: '',
customInfo: '',
config: {},
@@ -351,6 +354,16 @@ Vue.component('marquee-text', MarqueeText);
this.setDatetimeFormat();
this.setAppLanguage(this.config.appLanguage);
this.updateFeedLength();
if (
this.config.vrOverlayCpuUsage !== this.cpuUsageEnabled ||
this.config.pcUptimeOnFeed !== this.pcUptimeEnabled
) {
this.cpuUsageEnabled = this.config.vrOverlayCpuUsage;
this.pcUptimeEnabled = this.config.pcUptimeOnFeed;
AppApiVr.ToggleSystemMonitor(
this.cpuUsageEnabled || this.pcUptimeEnabled
);
}
};
$app.methods.updateOnlineFriendCount = function (count) {
@@ -435,7 +448,7 @@ Vue.component('marquee-text', MarqueeText);
.replace(' PM', ' pm')
.replace(',', '');
if (!this.config.hideCpuUsageFromFeed) {
if (this.cpuUsageEnabled) {
var cpuUsage = await AppApiVr.CpuUsage();
this.cpuUsage = cpuUsage.toFixed(0);
}
@@ -802,8 +815,6 @@ Vue.component('marquee-text', MarqueeText);
this.hudTimeout = JSON.parse(json);
};
$app.data.currentCulture = await AppApiVr.CurrentCulture();
$app.methods.setDatetimeFormat = async function () {
this.currentCulture = await AppApiVr.CurrentCulture();
var formatDate = function (date) {

View File

@@ -532,7 +532,7 @@ html
span(style="display:inline-block;font-weight:bold") {{ lastLocation.friendList.length !== 0 ? ` (${lastLocation.friendList.length})` : ''}}
br
span(style="float:right") {{ currentTime }}
span(v-if="config && !config.hideCpuUsageFromFeed" style="display:inline-block;margin-right:5px") {{ $t('vr.status.cpu') }} {{ cpuUsage }}%
span(v-if="config && cpuUsageEnabled" style="display:inline-block;margin-right:5px") {{ $t('vr.status.cpu') }} {{ cpuUsage }}%
span(style="display:inline-block") {{ $t('vr.status.online') }} {{ onlineFriendCount }} {{ customInfo }}
template(v-else)
svg(class="np-progress-circle")