From aeabb5181de7576ba595b2d2016b1c54dc7027f0 Mon Sep 17 00:00:00 2001 From: Natsumi Date: Sat, 13 Sep 2025 09:54:22 +1200 Subject: [PATCH] Small changes --- Dotnet/Cef/CefCustomMenuHandler.cs | 5 +++++ src-electron/download-dotnet-runtime.js | 2 +- src/app.scss | 27 ++++++++++++------------- src/service/appConfig.js | 4 ++++ src/types/globals.d.ts | 2 ++ 5 files changed, 25 insertions(+), 15 deletions(-) diff --git a/Dotnet/Cef/CefCustomMenuHandler.cs b/Dotnet/Cef/CefCustomMenuHandler.cs index ed409229..bca07ee7 100644 --- a/Dotnet/Cef/CefCustomMenuHandler.cs +++ b/Dotnet/Cef/CefCustomMenuHandler.cs @@ -11,6 +11,11 @@ namespace VRCX { public void OnBeforeContextMenu(IWebBrowser browserControl, IBrowser browser, IFrame frame, IContextMenuParams parameters, IMenuModel model) { + if (!browser.IsSame(MainForm.Instance.Browser?.GetBrowser())) + { + // allow devtools + return; + } // remove default right click when not in debug mode if (!Program.LaunchDebug && !parameters.TypeFlags.HasFlag(ContextMenuType.Selection) && diff --git a/src-electron/download-dotnet-runtime.js b/src-electron/download-dotnet-runtime.js index 2a807d91..ecc9c2a1 100644 --- a/src-electron/download-dotnet-runtime.js +++ b/src-electron/download-dotnet-runtime.js @@ -4,7 +4,7 @@ const https = require('https'); const { spawnSync } = require('child_process'); const { getArchAndPlatform } = require('./utils'); -const DOTNET_VERSION = '9.0.8'; +const DOTNET_VERSION = '9.0.9'; const DOTNET_RUNTIME_DIR = path.join( __dirname, '..', diff --git a/src/app.scss b/src/app.scss index 3ed12ac4..072e0981 100644 --- a/src/app.scss +++ b/src/app.scss @@ -585,24 +585,24 @@ img.friends-list-avatar { // height: 180px; // } -.x-dialog > .el-dialog { - max-width: 100%; -} +// .x-dialog { +// max-width: 100%; +// } -.x-user-dialog > .el-dialog > .el-dialog__header, -.x-world-dialog > .el-dialog > .el-dialog__header, -.x-avatar-dialog > .el-dialog > .el-dialog__header, -.x-group-dialog > .el-dialog > .el-dialog__header { +.x-user-dialog > .el-dialog__header, +.x-world-dialog > .el-dialog__header, +.x-avatar-dialog > .el-dialog__header, +.x-group-dialog > .el-dialog__header { display: none; padding: 0; } -.x-user-dialog > .el-dialog > .el-dialog__body, -.x-world-dialog > .el-dialog > .el-dialog__body, -.x-avatar-dialog > .el-dialog > .el-dialog__body, -.x-group-dialog > .el-dialog > .el-dialog__body { - padding: 20px; -} +// .x-user-dialog > .el-dialog__body, +// .x-world-dialog > .el-dialog__body, +// .x-avatar-dialog > .el-dialog__body, +// .x-group-dialog > .el-dialog__body { +// padding: 20px; +// } // .el-popper.hex { // min-width: auto; @@ -812,7 +812,6 @@ i.x-status-icon.red { // } .avatar-info { - margin-top: 2px; cursor: pointer; width: fit-content; vertical-align: top; diff --git a/src/service/appConfig.js b/src/service/appConfig.js index c1b317a7..00e9e3d7 100644 --- a/src/service/appConfig.js +++ b/src/service/appConfig.js @@ -1,4 +1,6 @@ import { reactive } from 'vue'; +import dayjs from 'dayjs'; +import * as utils from '../shared/utils'; const AppDebug = reactive({ debug: false, @@ -17,5 +19,7 @@ const AppDebug = reactive({ }); window.$debug = AppDebug; +window.utils = utils; +window.dayjs = dayjs; export { AppDebug }; diff --git a/src/types/globals.d.ts b/src/types/globals.d.ts index 1333e976..bfbfa88d 100644 --- a/src/types/globals.d.ts +++ b/src/types/globals.d.ts @@ -20,6 +20,8 @@ declare global { AssetBundleManager: AssetBundleManager; webApiService: webApiService; request: any; + utils: any; + dayjs: any; configRepository: any; datebase: any; gameLogService: any;