GithubStar/SteamTools
1
0
Fork 0
mirror of https://github.com/BeyondDimension/SteamTools.git synced 2026-10-28 23:19:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix macOS CEF Path

Browse Source
This commit is contained in:
Aigio Liu
2021-05-29 15:29:14 +08:00
parent 052bd13dfd
commit d12f9465ed
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ST.Client.Desktop.Avalonia/Application/UI/CefNetApp.cs
+20 -8
View File
@@ -100,7 +100,7 @@ navigator.__proto__ = newProto;
{
Platform.Windows => Path.Combine(AppContext.BaseDirectory, "CEF", "win-" + GetArch()),
Platform.Linux => Path.Combine(AppContext.BaseDirectory, "CEF", "linux-" + GetArch()),
Platform.Apple => DI.DeviceIdiom == DeviceIdiom.Desktop ? Path.Combine(AppContext.BaseDirectory, "Contents", "Frameworks", "Chromium Embedded Framework.framework") : throw new PlatformNotSupportedException(),
Platform.Apple => DI.DeviceIdiom == DeviceIdiom.Desktop ? Path.Combine(AppContext.BaseDirectory, "..", "Contents", "Frameworks", "Chromium Embedded Framework.framework") : throw new PlatformNotSupportedException(),
_ => throw new ArgumentOutOfRangeException(nameof(DI.Platform), DI.Platform, null),
};
@@ -118,12 +118,16 @@ navigator.__proto__ = newProto;
return;
}
var localesDirPath = Path.Combine(cefPath, "locales");
if (!Directory.Exists(localesDirPath))
string? localesDirPath = null;
if (PlatformInfo.IsMacOS)
{
Log.Error(TAG, "Missing Chromium Embedded Framework Binaries(locales), path: {0}", cefPath);
InitState = CefNetAppInitState.MissingBinaries;
return;
localesDirPath = Path.Combine(cefPath, "locales");
if (!Directory.Exists(localesDirPath))
{
Log.Error(TAG, "Missing Chromium Embedded Framework Binaries(locales), path: {0}", cefPath);
InitState = CefNetAppInitState.MissingBinaries;
return;
}
}
var externalMessagePump = args.Contains("--external-message-pump");
@@ -142,8 +146,6 @@ navigator.__proto__ = newProto;
MultiThreadedMessageLoop = !externalMessagePump,
ExternalMessagePump = externalMessagePump,
WindowlessRenderingEnabled = true,
LocalesDirPath = localesDirPath,
ResourcesDirPath = cefPath,
// https://magpcss.org/ceforum/viewtopic.php?t=14648#p32857
LogSeverity = ThisAssembly.Debuggable ? CefLogSeverity.Error : CefLogSeverity.Disable,
LogFile = logFile,
@@ -151,6 +153,16 @@ navigator.__proto__ = newProto;
UncaughtExceptionStackSize = 8,
};
if (!PlatformInfo.IsMacOS)
{
settings.LocalesDirPath = localesDirPath;
settings.ResourcesDirPath = Path.Combine(cefPath, "Resources");
}
else
{
settings.ResourcesDirPath = cefPath;
}
AppHelper.Initialized += () =>
{
if (PlatformInfo.IsMacOS || Environment.GetCommandLineArgs().Contains("--external-message-pump"))