Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions Source/HedgeModManager.UI/HedgeModManager.UI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
<PackageReference Include="Avalonia.HtmlRenderer" Version="12.0.0" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="12.1.0" />
<PackageReference Include="Avalonia.Fonts.Inter" Version="12.1.0" />
<PackageReference Include="Avalonia.Wayland" Version="12.1.0" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
<PackageReference Include="Markdig" Version="0.41.3" />
<PackageReference Include="Material.Icons.Avalonia" Version="3.0.2" />
Expand Down
26 changes: 25 additions & 1 deletion Source/HedgeModManager.UI/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,31 @@ public static string GetTagName()
// Avalonia configuration, don't remove; also used by visual designer.
public static AppBuilder BuildAvaloniaApp()
=> AppBuilder.Configure<App>()
.UsePlatformDetect()
.UsePlatformDetectPreferWayland()
.WithInterFont()
.LogToTrace();
}

internal static class LinuxPlatformDetector
{
public static AppBuilder UsePlatformDetectPreferWayland(this AppBuilder builder)
{
if (!OperatingSystem.IsLinux())
return builder.UsePlatformDetect();

if (IsWaylandSession())
builder.UseWayland();
else
builder.UseX11();

builder.UseSkia().UseHarfBuzz();
return builder;
}

private static bool IsWaylandSession()
=> !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("WAYLAND_DISPLAY"))
|| string.Equals(
Environment.GetEnvironmentVariable("XDG_SESSION_TYPE"),
"wayland",
StringComparison.OrdinalIgnoreCase);
}
3 changes: 2 additions & 1 deletion flatpak/io.github.hedge_dev.hedgemodmanager-autobuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ build-options:
command: HedgeModManager.UI

finish-args:
- --socket=x11
- --socket=fallback-x11
- --socket=wayland
# UnleashedRecomp permissions
- --filesystem=~/.config/UnleashedRecomp
- --filesystem=~/.local/share/applications/UnleashedRecomp.desktop:ro
Expand Down
3 changes: 2 additions & 1 deletion flatpak/io.github.hedge_dev.hedgemodmanager.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ build-options:
command: HedgeModManager.UI

finish-args:
- --socket=x11
- --socket=fallback-x11
- --socket=wayland
# UnleashedRecomp permissions
- --filesystem=~/.config/UnleashedRecomp
- --filesystem=~/.local/share/applications/UnleashedRecomp.desktop:ro
Expand Down