Skip to content

Fix SharpFont loading #174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Banane9 merged 2 commits into from
Dec 23, 2025
Merged

Fix SharpFont loading #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b60bdce
Tweak force update facet button position
Banane9 Dec 10, 2025
8eb23c0
Add SharpFont library to native lib resolver exclusions - finally act…
Banane9 Dec 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<TargetFramework>net10.0</TargetFramework>
<Version>0.28.1-beta</Version>
<RootNamespace>MonkeyLoader.Resonite</RootNamespace>
<LangVersion>13.0</LangVersion>
<LangVersion>14.0</LangVersion>
<Nullable>enable</Nullable>
<Deterministic>true</Deterministic>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
Expand Down
9 changes: 5 additions & 4 deletions MonkeyLoader.Resonite.Integration/UI/Facets/ForceUpdateFacets.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ internal sealed class ForceUpdateFacets : ResoniteEventHandlerMonkey<ForceUpdate
public override int Priority => HarmonyLib.Priority.Normal;

protected override bool AppliesTo(TemplateFacetPresetLoadedEvent eventData)
=> true;
=> true; // Always need to add the button so it shows up when enabled

protected override void Handle(TemplateFacetPresetLoadedEvent eventData)
{
Expand Down Expand Up @@ -56,8 +56,9 @@ protected override void Handle(TemplateFacetPresetLoadedEvent eventData)

// Place into upper-right corner with fixed size
button.RectTransform.AnchorMin.Value = float2.One;
button.RectTransform.AnchorMin.Value = float2.One;
button.RectTransform.OffsetMin.Value = new(-32, -32);
button.RectTransform.AnchorMax.Value = float2.One;
button.RectTransform.OffsetMin.Value = -34 * float2.One;
button.RectTransform.OffsetMax.Value = -2 * float2.One;

button.ColorDrivers.Clear();
button.ColorDrivers.Add().ColorDrive.Target = button.Slot[0].GetComponent<Image>().Tint;
Expand All @@ -66,10 +67,10 @@ protected override void Handle(TemplateFacetPresetLoadedEvent eventData)
protected override bool OnComputeDefaultEnabledState()
{
_wasEnabledFromDefault = true;

return true;
}

// Always need to add the button so it shows up when enabled
protected override bool OnEngineReady()
{
EnabledToggle!.Add(_enabledSessionShare);
Expand Down
4 changes: 3 additions & 1 deletion MonkeyLoaderWrapper/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,9 @@ private static async Task Main(string[] args)
// TODO: Should not be necessary anymore with the hookfxr changes. Either way, should be done by the load context
foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies())
{
if (assembly.GetName().Name == "SoundFlow") continue;
if (assembly.GetName().Name is "SoundFlow" or "SharpFont")
continue;

NativeLibrary.SetDllImportResolver(assembly, ResolveNativeLibrary);
}

Expand Down
Loading