cleanup code

This commit is contained in:
pypy
2020-11-08 18:54:03 +09:00
parent b710fad188
commit 2114ab1287
8 changed files with 419 additions and 282 deletions

View File

@@ -3,7 +3,6 @@
// This work is licensed under the terms of the MIT license.
// For a copy, see <https://opensource.org/licenses/MIT>.
using System;
using System.IO;
using System.Windows.Forms;
using CefSharp;
@@ -14,51 +13,56 @@ namespace VRCX
public partial class VRForm : Form
{
public static VRForm Instance;
private ChromiumWebBrowser Browser1;
private ChromiumWebBrowser Browser2;
private ChromiumWebBrowser _browser1;
private ChromiumWebBrowser _browser2;
public VRForm()
{
Instance = this;
InitializeComponent();
//
Browser1 = new ChromiumWebBrowser(Path.Combine(Program.BaseDirectory, "html/vr.html?1"))
_browser1 = new ChromiumWebBrowser(
Path.Combine(Program.BaseDirectory, "html/vr.html?1")
)
{
DragHandler = new NoopDragHandler(),
BrowserSettings =
{
// UniversalAccessFromFileUrls = CefState.Enabled,
DefaultEncoding = "UTF-8",
},
Dock = DockStyle.Fill,
Dock = DockStyle.Fill
};
Browser2 = new ChromiumWebBrowser(Path.Combine(Program.BaseDirectory, "html/vr.html?2"))
_browser2 = new ChromiumWebBrowser(
Path.Combine(Program.BaseDirectory, "html/vr.html?2")
)
{
DragHandler = new NoopDragHandler(),
BrowserSettings =
{
// UniversalAccessFromFileUrls = CefState.Enabled,
DefaultEncoding = "UTF-8",
},
Dock = DockStyle.Fill,
Dock = DockStyle.Fill
};
Util.ApplyJavascriptBindings(Browser1.JavascriptObjectRepository);
Util.ApplyJavascriptBindings(Browser2.JavascriptObjectRepository);
panel1.Controls.Add(Browser1);
panel2.Controls.Add(Browser2);
Util.ApplyJavascriptBindings(_browser1.JavascriptObjectRepository);
Util.ApplyJavascriptBindings(_browser2.JavascriptObjectRepository);
panel1.Controls.Add(_browser1);
panel2.Controls.Add(_browser2);
}
private void button_refresh_Click(object sender, System.EventArgs e)
{
Browser1.ExecuteScriptAsync("location.reload()");
Browser2.ExecuteScriptAsync("location.reload()");
VRCXVR.Refresh();
_browser1.ExecuteScriptAsync("location.reload()");
_browser2.ExecuteScriptAsync("location.reload()");
VRCXVR.Instance.Refresh();
}
private void button_devtools_Click(object sender, System.EventArgs e)
{
Browser1.ShowDevTools();
Browser2.ShowDevTools();
_browser1.ShowDevTools();
_browser2.ShowDevTools();
}
}
}