space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-02-14 19:29:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

WiP launcher CEF loading. (#2376)

Browse Source
This commit is contained in:
Pieter-Jan Briers
2021-12-28 17:37:54 +01:00
committed by GitHub
parent df4ddfdf25
commit ca59cff07f
10 changed files with 306 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Robust.Client.WebView/Cef/WebViewManagerCef.cs
View File

@@ -1,5 +1,6 @@
using System;
using System.IO;
using System.Reflection;
using Robust.Shared.ContentPack;
using Robust.Shared.IoC;
using Robust.Shared.Log;
@@ -10,6 +11,8 @@ namespace Robust.Client.WebView.Cef
{
internal partial class WebViewManagerCef : IWebViewManagerImpl
{
private static readonly string BasePath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location!)!;
private CefApp _app = default!;
[Dependency] private readonly IDependencyCollection _dependencyCollection = default!;
@@ -27,7 +30,7 @@ namespace Robust.Client.WebView.Cef
else
throw new NotSupportedException("Unsupported platform for CEF!");
var subProcessPath = PathHelpers.ExecutableRelativeFile(subProcessName);
var subProcessPath = Path.Combine(BasePath, subProcessName);
var cefResourcesPath = LocateCefResources();
// System.Console.WriteLine(AppContext.GetData("NATIVE_DLL_SEARCH_DIRECTORIES"));
@@ -60,7 +63,7 @@ namespace Robust.Client.WebView.Cef
private static string? LocateCefResources()
{
if (ProbeDir(PathHelpers.GetExecutableDirectory(), out var path))
if (ProbeDir(BasePath, out var path))
return path;