Adjusted the way progress works to show how many images have been sor…

…ted, instead of which one is being sorted.
Lolle2000la · May 24, 2018 · 5726e5d · 5726e5d
1 parent ba909fe
commit 5726e5d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/Image sort.Logic/ImageSelectorQuery.cs b/Image sort.Logic/ImageSelectorQuery.cs
@@ -429,7 +429,7 @@ public void AppendNewLocation(string newPath)
         /// <returns>(currentImage, maxImages)</returns>
         public (int, int) GetCurrentProgress()
         {
-            return (currentIndex, imagePathPool.Count);
+            return (currentIndex-1, imagePathPool.Count);
         }
         #endregion
     }

diff --git a/Image sort.UI/MainWindow.xaml.cs b/Image sort.UI/MainWindow.xaml.cs
@@ -486,6 +486,7 @@ private void LoadImage(BitmapImage image)
                 OpenInExplorerLink.NavigateUri = new Uri(pathToImage);
                 OpenInExplorerLinkHost.Visibility = Visibility.Visible;
 
+                // Show Progress
                 (int current, int max) = folderSelector.GetCurrentProgress();
                 ProgressIndicatorText.Text = $"Progress: {current}/{max}";
             }
@@ -495,7 +496,11 @@ private void LoadImage(BitmapImage image)
                 FileNameInfo.Text = "";
                 FileTypeInfo.Text = "";
                 FileSizeInfo.Text = "";
-                ProgressIndicatorText.Text = "";
+
+                // Show progress
+                (int current, int max) = folderSelector.GetCurrentProgress();
+                ProgressIndicatorText.Text = $"Progress: {current}/{max}";
+
                 OpenInExplorerLink.NavigateUri = null;
                 // Collapse link again to prevent accidental clicking.
                 OpenInExplorerLinkHost.Visibility = Visibility.Collapsed;