Auto-select first image on search / reload (#184)

RupertAvery · Jan 18, 2024 · c7b8a63 · c7b8a63
1 parent 7a73407
commit c7b8a63
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 14 deletions.
diff --git a/Diffusion.Toolkit/Controls/ThumbnailView.xaml.cs b/Diffusion.Toolkit/Controls/ThumbnailView.xaml.cs
@@ -667,7 +667,7 @@ public void ResetView(bool focus, bool gotoEnd = false)
                 {
                     var index = gotoEnd ? Model.Images.Count - 1 : 0;
 
-                    ShowItem(index, focus && ThumbnailListView.IsFocused);
+                    ShowItem(index, focus);
                 }
             });
         }

diff --git a/Diffusion.Toolkit/MainWindow.xaml.Watchers.cs b/Diffusion.Toolkit/MainWindow.xaml.Watchers.cs
@@ -79,21 +79,24 @@ private void QueueFile(string path)
         {
             lock (_lock)
             {
-                var attr = File.GetAttributes(path);
+                if (File.Exists(path))
+                {
+                    var attr = File.GetAttributes(path);
 
-                if (attr.HasFlag(FileAttributes.Directory))
-                    return;
+                    if (attr.HasFlag(FileAttributes.Directory))
+                        return;
 
-                if (t == null)
-                {
-                    _detectedFiles = new List<string>();
-                    t = new Timer(ProcessQueueCallback, null, 2000, Timeout.Infinite);
-                }
-                else
-                {
-                    t.Change(2000, Timeout.Infinite);
+                    if (t == null)
+                    {
+                        _detectedFiles = new List<string>();
+                        t = new Timer(ProcessQueueCallback, null, 2000, Timeout.Infinite);
+                    }
+                    else
+                    {
+                        t.Change(2000, Timeout.Infinite);
+                    }
+                    _detectedFiles.Add(path);
                 }
-                _detectedFiles.Add(path);
             }
         }
 

diff --git a/Diffusion.Toolkit/Pages/Search.xaml.cs b/Diffusion.Toolkit/Pages/Search.xaml.cs
@@ -954,7 +954,29 @@ public void ReloadMatches(ReloadOptions? options)
             {
                 LoadMatches();
                 ThumbnailListView.ResetView(options?.Focus ?? true, options?.GotoEnd ?? false);
-                Dispatcher.Invoke(() => { options?.OnCompleted?.Invoke(); });
+                Dispatcher.Invoke(() =>
+                {
+                    options?.OnCompleted?.Invoke();
+
+                    if (_model.Images is { Count: > 0 })
+                    {
+                        if (options?.GotoEnd ?? false)
+                        {
+                            _model.SelectedImageEntry = _model.Images[^1];
+                        }
+                        else
+                        {
+                            _model.SelectedImageEntry = _model.Images[0];
+                        }
+                    }
+                    else
+                    {
+                        _model.SelectedImageEntry = null;
+                    }
+
+                });
+
+
             });
         }