Browse Source

File list fixes. Downgraded avalonia

Krzysztof Krysiński 3 tuần trước cách đây
mục cha
commit
ff7d36216c

+ 1 - 1
src/ColorPicker

@@ -1 +1 @@
-Subproject commit bf83dee60fda714c94024212948a1ff5ed40d438
+Subproject commit 943e9abbb60b73c4965b947e987dc2696e0b08f8

+ 1 - 1
src/Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
     <PropertyGroup>
         <CodeAnalysisRuleSet>../Custom.ruleset</CodeAnalysisRuleSet>
-		    <AvaloniaVersion>11.3.3</AvaloniaVersion>
+		    <AvaloniaVersion>11.3.0</AvaloniaVersion>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" />

+ 1 - 1
src/Drawie

@@ -1 +1 @@
-Subproject commit 9bf9afe9aabbb8ad5922d67c235e2653666930e1
+Subproject commit d4ec7ec0f7e7ff036b23d7b6ef389fa25ceaa344

+ 1 - 1
src/PixiDocks

@@ -1 +1 @@
-Subproject commit cb36e5ed4b61b99d52461e353d009ef52cb7d97b
+Subproject commit 6e745d0309ad7a00a53f62f2aa362be77903a5fd

+ 15 - 1
src/PixiEditor/Models/Controllers/ClipboardController.cs

@@ -541,7 +541,21 @@ internal static class ClipboardController
         if (!obj.Contains(DataFormats.Files))
             return [];
 
-        return ((IEnumerable<IStorageItem>)await obj.GetDataAsync(DataFormats.Files));
+        var data = await obj.GetDataAsync(DataFormats.Files);
+        if (data == null)
+            return [];
+
+        if(data is IEnumerable<IStorageItem> storageItems)
+            return storageItems;
+
+        if(data is Task<object> task)
+        {
+            data = await task;
+            if (data is IEnumerable<IStorageItem> storageItemsFromTask)
+                return storageItemsFromTask;
+        }
+
+        return [];
     }
 
 

+ 6 - 2
src/PixiEditor/Views/MainView.axaml.cs

@@ -75,9 +75,13 @@ public partial class MainView : UserControl
             return;
         }
 
-        if (fileDropList is { Length: > 0 } && Importer.IsSupportedFile(fileDropList[0].Path.LocalPath))
+        if (fileDropList is { Length: > 0 })
         {
-            Context.FileSubViewModel.OpenFromPath(fileDropList[0].Path.LocalPath);
+            foreach (var item in fileDropList)
+            {
+                Importer.IsSupportedFile(item.Path.LocalPath);
+                Context.FileSubViewModel.OpenFromPath(item.Path.LocalPath);
+            }
         }
     }
 

+ 1 - 1
tests/Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
     <PropertyGroup>
         <CodeAnalysisRuleSet>../Custom.ruleset</CodeAnalysisRuleSet>
-		<AvaloniaVersion>11.3.3</AvaloniaVersion>
+		<AvaloniaVersion>11.3.0</AvaloniaVersion>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" />