Merge pull request #18 from Icon-Pack-Provider/var

ray1997 · web-flow · commit 548413f221e0 · 2023-04-20T18:10:23.000+07:00
Quick fixes on upload experience
diff --git a/DBDIconRepo/Helper/Uploadable/UploadableExtensions.cs b/DBDIconRepo/Helper/Uploadable/UploadableExtensions.cs
@@ -93,7 +93,7 @@ private static IEnumerable<string> HelpGetAllSelectedPaths(ObservableCollection<
         {
             if (Equals(folder.IsSelected, false))
                 goto reroll;
-            return GetRandomIcon(root);
+            return GetRandomIcon(folder.SubItems);
         }
 
         if (Equals(root[index].IsSelected, false))
diff --git a/DBDIconRepo/Views/UploadPack.xaml b/DBDIconRepo/Views/UploadPack.xaml
@@ -386,7 +386,7 @@
                     <StackPanel Orientation="Horizontal" 
                                 Visibility="{Binding IsUploadingPackRightNow}">
                         <ui:ProgressRing Width="32" Height="32"/>
-                        <TextBlock Text="Uplading..." VerticalAlignment="Center" Margin="4,0" Foreground="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
+                        <TextBlock Text="Uploading..." VerticalAlignment="Center" Margin="4,0" Foreground="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
                     </StackPanel>
                     <ScrollViewer VerticalScrollBarVisibility="Disabled"
                                   HorizontalScrollBarVisibility="Disabled">

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ private static IEnumerable<string> HelpGetAllSelectedPaths(ObservableCollection<`
`93`	`93`	`{`
`94`	`94`	`if (Equals(folder.IsSelected, false))`
`95`	`95`	`goto reroll;`
`96`		`- return GetRandomIcon(root);`
	`96`	`+ return GetRandomIcon(folder.SubItems);`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`if (Equals(root[index].IsSelected, false))`