diff --git a/src/AppCommon/FileTime.App.CommandPalette.Abstractions/FileTime.App.CommandPalette.Abstractions.csproj b/src/AppCommon/FileTime.App.CommandPalette.Abstractions/FileTime.App.CommandPalette.Abstractions.csproj
index 0433a7a..92c33b3 100644
--- a/src/AppCommon/FileTime.App.CommandPalette.Abstractions/FileTime.App.CommandPalette.Abstractions.csproj
+++ b/src/AppCommon/FileTime.App.CommandPalette.Abstractions/FileTime.App.CommandPalette.Abstractions.csproj
@@ -13,7 +13,7 @@
-
+
diff --git a/src/AppCommon/FileTime.App.CommandPalette/FileTime.App.CommandPalette.csproj b/src/AppCommon/FileTime.App.CommandPalette/FileTime.App.CommandPalette.csproj
index 4a0a6a7..f439ade 100644
--- a/src/AppCommon/FileTime.App.CommandPalette/FileTime.App.CommandPalette.csproj
+++ b/src/AppCommon/FileTime.App.CommandPalette/FileTime.App.CommandPalette.csproj
@@ -14,7 +14,7 @@
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/src/AppCommon/FileTime.App.Core/FileTime.App.Core.csproj b/src/AppCommon/FileTime.App.Core/FileTime.App.Core.csproj
index 5646bdb..71ef6f1 100644
--- a/src/AppCommon/FileTime.App.Core/FileTime.App.Core.csproj
+++ b/src/AppCommon/FileTime.App.Core/FileTime.App.Core.csproj
@@ -11,7 +11,7 @@
-
+
diff --git a/src/AppCommon/FileTime.App.FrequencyNavigation.Abstractions/FileTime.App.FrequencyNavigation.Abstractions.csproj b/src/AppCommon/FileTime.App.FrequencyNavigation.Abstractions/FileTime.App.FrequencyNavigation.Abstractions.csproj
index 8314411..6b83c22 100644
--- a/src/AppCommon/FileTime.App.FrequencyNavigation.Abstractions/FileTime.App.FrequencyNavigation.Abstractions.csproj
+++ b/src/AppCommon/FileTime.App.FrequencyNavigation.Abstractions/FileTime.App.FrequencyNavigation.Abstractions.csproj
@@ -13,7 +13,7 @@
-
+
diff --git a/src/AppCommon/FileTime.App.FrequencyNavigation/FileTime.App.FrequencyNavigation.csproj b/src/AppCommon/FileTime.App.FrequencyNavigation/FileTime.App.FrequencyNavigation.csproj
index ad9f25c..11105f6 100644
--- a/src/AppCommon/FileTime.App.FrequencyNavigation/FileTime.App.FrequencyNavigation.csproj
+++ b/src/AppCommon/FileTime.App.FrequencyNavigation/FileTime.App.FrequencyNavigation.csproj
@@ -14,7 +14,7 @@
-
+
all
diff --git a/src/AppCommon/FileTime.App.FuzzyPanel.Abstraction/FileTime.App.FuzzyPanel.Abstraction.csproj b/src/AppCommon/FileTime.App.FuzzyPanel.Abstraction/FileTime.App.FuzzyPanel.Abstraction.csproj
index f2f54a5..17100de 100644
--- a/src/AppCommon/FileTime.App.FuzzyPanel.Abstraction/FileTime.App.FuzzyPanel.Abstraction.csproj
+++ b/src/AppCommon/FileTime.App.FuzzyPanel.Abstraction/FileTime.App.FuzzyPanel.Abstraction.csproj
@@ -8,7 +8,7 @@
-
+
diff --git a/src/AppCommon/FileTime.App.FuzzyPanel/FileTime.App.FuzzyPanel.csproj b/src/AppCommon/FileTime.App.FuzzyPanel/FileTime.App.FuzzyPanel.csproj
index 04448d7..df37456 100644
--- a/src/AppCommon/FileTime.App.FuzzyPanel/FileTime.App.FuzzyPanel.csproj
+++ b/src/AppCommon/FileTime.App.FuzzyPanel/FileTime.App.FuzzyPanel.csproj
@@ -7,7 +7,7 @@
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/src/Core/FileTime.Core.Abstraction/FileTime.Core.Abstraction.csproj b/src/Core/FileTime.Core.Abstraction/FileTime.Core.Abstraction.csproj
index 78df62f..58d8690 100644
--- a/src/Core/FileTime.Core.Abstraction/FileTime.Core.Abstraction.csproj
+++ b/src/Core/FileTime.Core.Abstraction/FileTime.Core.Abstraction.csproj
@@ -12,7 +12,7 @@
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/src/Core/FileTime.Core.Command/FileTime.Core.Command.csproj b/src/Core/FileTime.Core.Command/FileTime.Core.Command.csproj
index 81bc64b..7b6d24c 100644
--- a/src/Core/FileTime.Core.Command/FileTime.Core.Command.csproj
+++ b/src/Core/FileTime.Core.Command/FileTime.Core.Command.csproj
@@ -5,7 +5,7 @@
-
+
diff --git a/src/GuiApp/Avalonia/FileTime.GuiApp.Abstractions/FileTime.GuiApp.Abstractions.csproj b/src/GuiApp/Avalonia/FileTime.GuiApp.Abstractions/FileTime.GuiApp.Abstractions.csproj
index 1524830..0684d53 100644
--- a/src/GuiApp/Avalonia/FileTime.GuiApp.Abstractions/FileTime.GuiApp.Abstractions.csproj
+++ b/src/GuiApp/Avalonia/FileTime.GuiApp.Abstractions/FileTime.GuiApp.Abstractions.csproj
@@ -12,7 +12,7 @@
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/src/GuiApp/Avalonia/FileTime.GuiApp.App/FileTime.GuiApp.App.csproj b/src/GuiApp/Avalonia/FileTime.GuiApp.App/FileTime.GuiApp.App.csproj
index 5b77c45..786c9de 100644
--- a/src/GuiApp/Avalonia/FileTime.GuiApp.App/FileTime.GuiApp.App.csproj
+++ b/src/GuiApp/Avalonia/FileTime.GuiApp.App/FileTime.GuiApp.App.csproj
@@ -25,11 +25,11 @@
-
-
+
+
-
-
+
+
diff --git a/src/GuiApp/Avalonia/FileTime.GuiApp.App/Startup.cs b/src/GuiApp/Avalonia/FileTime.GuiApp.App/Startup.cs
index bc0ca86..c00e427 100644
--- a/src/GuiApp/Avalonia/FileTime.GuiApp.App/Startup.cs
+++ b/src/GuiApp/Avalonia/FileTime.GuiApp.App/Startup.cs
@@ -59,7 +59,8 @@ public static class Startup
serviceCollection.TryAddSingleton();
serviceCollection.TryAddSingleton();
serviceCollection.TryAddSingleton();
- serviceCollection.TryAddSingleton();
+ serviceCollection.TryAddSingleton();
+ serviceCollection.TryAddSingleton(sp => sp.GetRequiredService());
serviceCollection.TryAddSingleton();
serviceCollection.TryAddSingleton(s => s.GetRequiredService());
diff --git a/src/GuiApp/Avalonia/FileTime.GuiApp.Font/FileTime.GuiApp.Font.csproj b/src/GuiApp/Avalonia/FileTime.GuiApp.Font/FileTime.GuiApp.Font.csproj
index 765975d..0c56af1 100644
--- a/src/GuiApp/Avalonia/FileTime.GuiApp.Font/FileTime.GuiApp.Font.csproj
+++ b/src/GuiApp/Avalonia/FileTime.GuiApp.Font/FileTime.GuiApp.Font.csproj
@@ -12,7 +12,7 @@
-
+
diff --git a/src/GuiApp/Avalonia/FileTime.GuiApp/FileTime.GuiApp.csproj b/src/GuiApp/Avalonia/FileTime.GuiApp/FileTime.GuiApp.csproj
index 461051e..f299078 100644
--- a/src/GuiApp/Avalonia/FileTime.GuiApp/FileTime.GuiApp.csproj
+++ b/src/GuiApp/Avalonia/FileTime.GuiApp/FileTime.GuiApp.csproj
@@ -19,14 +19,14 @@
-
-
-
+
+
+
-
-
-
-
+
+
+
+
diff --git a/src/GuiApp/Avalonia/FileTime.GuiApp/Services/SystemClipboardService.cs b/src/GuiApp/Avalonia/FileTime.GuiApp/Services/SystemClipboardService.cs
index bacbba1..d2ab155 100644
--- a/src/GuiApp/Avalonia/FileTime.GuiApp/Services/SystemClipboardService.cs
+++ b/src/GuiApp/Avalonia/FileTime.GuiApp/Services/SystemClipboardService.cs
@@ -1,14 +1,14 @@
-using Avalonia;
-using Avalonia.Input.Platform;
+using Avalonia.Controls;
using FileTime.App.Core.Services;
namespace FileTime.GuiApp.Services;
public class SystemClipboardService : ISystemClipboardService
{
+ internal TopLevel? TopLevel { get; set; }
public async Task CopyToClipboardAsync(string text)
{
- var clipboard = AvaloniaLocator.Current.GetService();
+ var clipboard = TopLevel?.Clipboard;
if (clipboard is null) { return; }
@@ -16,7 +16,7 @@ public class SystemClipboardService : ISystemClipboardService
}
public async Task GetFiles()
{
- var clipboard = AvaloniaLocator.Current.GetService();
+ var clipboard = TopLevel?.Clipboard;
if (clipboard is null) { return; }
diff --git a/src/GuiApp/Avalonia/FileTime.GuiApp/Views/MainWindow.axaml.cs b/src/GuiApp/Avalonia/FileTime.GuiApp/Views/MainWindow.axaml.cs
index 81a2bef..6bbae17 100644
--- a/src/GuiApp/Avalonia/FileTime.GuiApp/Views/MainWindow.axaml.cs
+++ b/src/GuiApp/Avalonia/FileTime.GuiApp/Views/MainWindow.axaml.cs
@@ -36,6 +36,7 @@ public partial class MainWindow : Window
_logger?.LogInformation($"Starting {nameof(MainWindow)} initialization...");
_modalService = DI.ServiceProvider.GetRequiredService();
_modalService.OpenModals.ToCollection().Subscribe(m => _openModals = m);
+ DI.ServiceProvider.GetRequiredService().TopLevel = GetTopLevel(this);
InitializeComponent();
}
diff --git a/src/Providers/FileTime.Providers.Local/FileTime.Providers.Local.csproj b/src/Providers/FileTime.Providers.Local/FileTime.Providers.Local.csproj
index cc22a0e..908b309 100644
--- a/src/Providers/FileTime.Providers.Local/FileTime.Providers.Local.csproj
+++ b/src/Providers/FileTime.Providers.Local/FileTime.Providers.Local.csproj
@@ -11,7 +11,7 @@
-
+