Merge branch 'tomlm/fixPaste' of https://github.com/jinek/Consolonia …

…into tomlm/fixPaste
jinek · Jan 9, 2025 · 690143f · 690143f
2 parents bb01b75 + 2090e28
commit 690143f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/src/Consolonia.Core/Infrastructure/ClipboardImpl.cs b/src/Consolonia.Core/Infrastructure/ClipboardImpl.cs
@@ -2,6 +2,7 @@
 using System.Threading.Tasks;
 using Avalonia.Input;
 using TextCopy;
+using IClipboard = Avalonia.Input.Platform.IClipboard;
 
 namespace Consolonia.Core.Infrastructure
 {
@@ -11,11 +12,13 @@ namespace Consolonia.Core.Infrastructure
     // for linux and mac it has a ton of dependencies on the entire rendering subsystem. 
     // This is a temporary solution to get the clipboard working, but it is not a good solution for linux as it relies 
     // on invoking a shell command to get the clipboard content, and doesn't support GetData/SetData/GetFormats
-    internal class ClipboardImpl : Avalonia.Input.Platform.IClipboard
+    internal class ClipboardImpl : IClipboard
     {
 #pragma warning disable CA1822 // Mark members as static
         public Task ClearAsync()
-            => ClipboardService.SetTextAsync(string.Empty);
+        {
+            return ClipboardService.SetTextAsync(string.Empty);
+        }
 
         public Task<object> GetDataAsync(string format)
         {
@@ -28,14 +31,18 @@ public Task<string[]> GetFormatsAsync()
         }
 
         public Task<string> GetTextAsync()
-            => ClipboardService.GetTextAsync();
+        {
+            return ClipboardService.GetTextAsync();
+        }
 
         public Task SetDataObjectAsync(IDataObject data)
         {
             throw new NotImplementedException();
         }
 
         public Task SetTextAsync(string text)
-            => ClipboardService.SetTextAsync(text ?? String.Empty);
+        {
+            return ClipboardService.SetTextAsync(text ?? string.Empty);
+        }
     }
-}
+}
diff --git a/src/Consolonia.Core/Infrastructure/ConsoloniaPlatform.cs b/src/Consolonia.Core/Infrastructure/ConsoloniaPlatform.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Diagnostics;
-using System.Reflection;
 using Avalonia;
 using Avalonia.Controls.Platform;
 using Avalonia.Input;
@@ -89,7 +88,6 @@ public void Initialize()
             //{
             //    //.Bind<IClipboard>().ToConstant(new X11Clipboard(this))
             //}
-
         }
 
         [DebuggerStepThrough]