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

Support launch URLs, Fixes

Browse Source
This commit is contained in:
Natsumi
2022-09-14 22:43:58 +12:00
parent 6206d8ac8a
commit e61fa926c5
5 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
AppApi.cs
View File

@@ -346,10 +346,14 @@ namespace VRCX
public void FocusWindow()
{
if (MainForm.Instance.WindowState == FormWindowState.Minimized)
MainForm.Instance.WindowState = FormWindowState.Normal;
MainForm.Instance.Show();
MainForm.Instance.Activate();
MainForm.Instance.Invoke(new Action(() =>
{
if (MainForm.Instance.WindowState == FormWindowState.Minimized)
MainForm.Instance.WindowState = FormWindowState.Normal;
MainForm.Instance.Show();
MainForm.Instance.Activate();
}));
}
public string FollowUrl(string url)

2
Installer/installer.nsi
View File

@@ -143,7 +143,7 @@ Section "Install" SecInstall
SetOutPath "$INSTDIR"
File /r /x *.log "..\bin\x64\Release\*.*"
File /r /x *.log /x *.pdb "..\bin\x64\Release\*.*"
WriteRegStr HKLM "Software\VRCX" "InstallDir" $INSTDIR
WriteUninstaller "$INSTDIR\Uninstall.exe"

19
WinformThemer.cs
View File

@@ -59,16 +59,19 @@ namespace VRCX
/// <param name="forms"></param>
public static void SetThemeToGlobal(List<Form> forms)
{
//For each form, set the theme, then move focus onto it to force refresh
foreach(Form form in forms)
MainForm.Instance.Invoke(new Action(() =>
{
//Set the theme of the window
SetThemeToGlobal(form.Handle);
//For each form, set the theme, then move focus onto it to force refresh
foreach (Form form in forms)
{
//Set the theme of the window
SetThemeToGlobal(form.Handle);
//Change opacity to foce full redraw
form.Opacity = 0.99999;
form.Opacity = 1;
}
//Change opacity to foce full redraw
form.Opacity = 0.99999;
form.Opacity = 1;
}
}));
}
private static void SetThemeToGlobal(IntPtr handle)

6
html/src/app.js
View File

@@ -19365,16 +19365,16 @@ speechSynthesis.getVoices();
}
});
$app.methods.eventLaunchCommand = function (command) {
$app.methods.eventLaunchCommand = function (input) {
if (!API.isLoggedIn) {
return;
}
var args = command.split('/');
var args = input.split('/');
var command = args[0];
var commandArg = args[1];
switch (command) {
case 'world':
this.showWorldDialog(commandArg);
this.directAccessWorld(input.replace('world/', ''));
break;
case 'avatar':
this.showAvatarDialog(commandArg);

5
html/src/index.pug
View File

@@ -2993,14 +2993,13 @@ html
el-dropdown-menu(#default="dropdown")
template(v-for="groupAPI in API.favoriteWorldGroups" :key="groupAPI.name")
el-dropdown-item(style="display:block;margin:10px 0" @click.native="selectWorldImportGroup(groupAPI)" :disabled="groupAPI.count >= groupAPI.capacity") {{ groupAPI.displayName }} ({{ groupAPI.count }}/{{ groupAPI.capacity }})
el-button(size="small" @click="importWorldImportTable" style="margin:10px" :disabled="worldImportTable.data.length === 0 || !worldImportDialog.worldImportFavoriteGroup") Import Worlds
el-button(size="small" @click="importWorldImportTable" style="margin:5px" :disabled="worldImportTable.data.length === 0 || !worldImportDialog.worldImportFavoriteGroup") Import Worlds
span(v-if="worldImportDialog.worldImportFavoriteGroup") {{ worldImportTable.data.length }} / {{ worldImportDialog.worldImportFavoriteGroup.capacity - worldImportDialog.worldImportFavoriteGroup.count }}
span(v-if="worldImportDialog.importProgress" style="margin:10px") Import Progress: {{ worldImportDialog.importProgress }}/{{ worldImportDialog.importProgressTotal }}
br
el-button(size="small" @click="clearWorldImportTable") Clear Table
br
template(v-if="worldImportDialog.errors")
el-button(size="small" @click="worldImportDialog.errors = ''") Clear Errors
el-button(size="small" @click="worldImportDialog.errors = ''" style="margin-left:5px") Clear Errors
h2(style="font-weight:bold;margin:0") Errors:
pre(v-text="worldImportDialog.errors" style="white-space:pre-wrap;font-size:12px")
data-tables(v-if="worldImportDialog.visible" v-bind="worldImportTable" v-loading="worldImportDialog.loading" style="margin-top:10px")