Free, open-source file converter. Convert 263 formats offline by drag & drop — images, PDF, Word, Excel, PowerPoint, HWP/HWPX, video, audio, e-books and archives. No upload, no Office needed.
C# audio-converteravaloniabatch-conversionconvertercsharpdocument-converterdocx-to-pdfdotnetdrag-and-dropfile-conversionfile-converterheic-converterhwphwpximage-converterlinuxmacospdf-convertervideo-converterwindows
Merge remote-tracking branch 'upstream/main' into feat/native-wayland-support
mahaveergurjar21dc41205f7a
diff --cc Directory.Packages.propsindex 3675f092,a8af2b14..ec8addbe--- a/Directory.Packages.props+++ b/Directory.Packages.props@@@ -11,10 -11,8 +11,11 @@@<ItemGroup Label="UI"><PackageVersion Include="Avalonia" Version="$(AvaloniaVersion)" /><PackageVersion Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />+ <PackageVersion Include="Avalonia.Wayland" Version="$(AvaloniaVersion)" />+ <PackageVersion Include="Avalonia.Skia" Version="$(AvaloniaVersion)" />+ <PackageVersion Include="Avalonia.HarfBuzz" Version="$(AvaloniaVersion)" /><PackageVersion Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />+ <PackageVersion Include="Avalonia.Controls.ColorPicker" Version="$(AvaloniaVersion)" /><PackageVersion Include="Avalonia.Headless" Version="$(AvaloniaVersion)" /><PackageVersion Include="Avalonia.Headless.XUnit" Version="$(AvaloniaVersion)" /><PackageVersion Include="AvaloniaUI.DiagnosticsSupport" Version="2.2.3" />diff --cc src/Filee.App/Filee.App.csprojindex 4abd5ee4,aff92ad7..3355c555--- a/src/Filee.App/Filee.App.csproj+++ b/src/Filee.App/Filee.App.csproj@@@ -23,10 -23,8 +23,11 @@@<ItemGroup><PackageReference Include="Avalonia" /><PackageReference Include="Avalonia.Desktop" />+ <PackageReference Include="Avalonia.Wayland" />+ <PackageReference Include="Avalonia.Skia" />+ <PackageReference Include="Avalonia.HarfBuzz" /><PackageReference Include="Avalonia.Themes.Fluent" />+ <PackageReference Include="Avalonia.Controls.ColorPicker" /><PackageReference Include="AvaloniaUI.DiagnosticsSupport"><IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets><PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>diff --cc src/Filee.App/Program.csindex 3586128f,9f862e58..f9419de4--- a/src/Filee.App/Program.cs+++ b/src/Filee.App/Program.cs@@@ -265,21 -274,21 +274,32 @@@ internal static class Progra/// <summary>Also used by the XAML previewer.</summary>public static AppBuilder BuildAvaloniaApp(){- var builder = AppBuilder.Configure<App>().UsePlatformDetect();+ var builder = AppBuilder.Configure<App>();+ if (OperatingSystem.IsLinux() && !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("WAYLAND_DISPLAY")))+ {+ builder.UseWayland().UseSkia().UseHarfBuzz();+ }+ else+ {+ builder.UsePlatformDetect();+ }- return builder+++ if (OperatingSystem.IsMacOS())+ builder = builder.With(new MacOSPlatformOptions { ShowInDock = PreloadedStore?.Settings.ShowInDock ?? true });+ if (OperatingSystem.IsWindows())+ builder = builder.With(WindowsRendering.Options(+ WindowsRendering.Normalize(Environment.GetEnvironmentVariable(WindowsRendering.Variable)),+ adapters => Log.LogInformation("Graphics adapters: {Adapters}", adapters)));+++ builder = builder.ConfigureFonts(fonts => fonts.AddFontCollection(new FileeFontCollection()))#if DEBUG.WithDeveloperTools()#endif.LogToTrace();+++ AvaloniaLogForwarder.Install(Log);+ return builder;}}diff --cc src/Filee.App/ViewModels/RadialViewModel.csindex 95b43f7f,9e6705cc..8e3c7b8f--- a/src/Filee.App/ViewModels/RadialViewModel.cs+++ b/src/Filee.App/ViewModels/RadialViewModel.cs@@@ -80,19 -128,22 +128,22 @@@ public sealed partial class RadialViewM{IsClickMode = false;Files = [];- Presets = [];- _subPresets = [];ApplyAppearance();- ReserveSubRing = store.Profiles.Any(profile => profile.PresetIds.Any(id => store.FindPreset(id)?.IsGroup == true));- Items = [];+ ReserveSubRing = store.Profiles.Any(profile => HasGroups(profile.PresetIds.Concat(profile.BackPresetIds ?? [])));+ _loads++;+ (_front, _back, _backIds, _formats) = (Face.Empty, Face.Empty, [], []);+ ShowFace(back: false);CenterTitle = loc["donut.center_drag"];CenterSubtitle = null;- DonutOpacity = 0;- HitBackground = "#01000000";+ DonutOpacity = 1;+ HitBackground = "Transparent";}- /// <summary>Fills the donut for the given files.</summary>- public void Load(IReadOnlyList<string> files, bool clickMode)+ /// <summary>+ /// Fills the donut for the given files, on its front face, or on the back when <paramref name="backFace"/> and the+ /// back has a slice for them (the same files again after a preset was edited).+ /// </summary>+ public void Load(IReadOnlyList<string> files, bool clickMode, bool backFace = false){IsClickMode = clickMode;Files = files;