Upload FastSeekWpf/MainWindow.xaml.cs

FastSeekWpf/MainWindow.xaml.cs

@@ -14,6 +14,7 @@ using System.Windows.Data;
 using System.Windows.Input;
 using System.Windows.Interop;
 using System.Windows.Media;
+using System.Windows.Media.Animation;
 using System.Windows.Threading;
 using FastSeekWpf.Core;
 using FastSeekWpf.NativeInterop;
@@ -56,28 +57,21 @@ public partial class MainWindow : Window, INotifyPropertyChanged
         DataContext = this;
         _excludedDirs = CacheManager.LoadExclusions();
 
-        // Hook WndProc for custom messages
         Loaded += (s, e) =>
         {
             var helper = new WindowInteropHelper(this);
             var hwnd = helper.Handle;
             HwndSource.FromHwnd(hwnd)?.AddHook(WndProc);
-
-            // Enable DWM rounded corners
             EnableDwmRoundedCorners(hwnd);
         };
     }
 
-    /// <summary>
-    /// Enable native DWM rounded corners (Windows 11) and dark mode.
-    /// </summary>
     private void EnableDwmRoundedCorners(IntPtr hwnd)
     {
         try
         {
             int cornerPref = Win32Api.DWMWCP_ROUND;
             Win32Api.DwmSetWindowAttribute(hwnd, Win32Api.DWMWA_WINDOW_CORNER_PREFERENCE, ref cornerPref, Marshal.SizeOf(cornerPref));
-
             int darkMode = 1;
             Win32Api.DwmSetWindowAttribute(hwnd, Win32Api.DWMWA_USE_IMMERSIVE_DARK_MODE, ref darkMode, Marshal.SizeOf(darkMode));
             Logger.Log("DWM rounded corners + dark mode enabled.");
@@ -93,11 +87,23 @@ public partial class MainWindow : Window, INotifyPropertyChanged
         Logger.Log("Window_Loaded");
         if (_initialized) return;
         _initialized = true;
-
         CenterWindow();
+        ShowEmptyState();
         Task.Run(async () => await InitializeAsync());
     }
 
+    private void ShowEmptyState()
+    {
+        Dispatcher.Invoke(() =>
+        {
+            ResultsScroll.Visibility = Visibility.Collapsed;
+            EmptyHint.Visibility = Visibility.Visible;
+            StatusBar.Visibility = Visibility.Visible;
+            StatusText.Text = "Indexing...";
+            SepLine.Visibility = Visibility.Collapsed;
+        });
+    }
+
     private async Task InitializeAsync()
     {
         Logger.Log("InitializeAsync start");
@@ -117,7 +123,6 @@ public partial class MainWindow : Window, INotifyPropertyChanged
                 return;
             }
 
-            // Try cache first
             bool needFullScan = true;
             var cache = CacheManager.LoadCache();
             if (cache != null)
@@ -129,7 +134,6 @@ public partial class MainWindow : Window, INotifyPropertyChanged
                 }
                 Logger.Log($"Loaded cache: {_index.Count} files");
 
-                // Delta catch-up
                 var checkpoints = new List<JournalCheckpoint>(cache.Checkpoints);
                 bool deltaOk = true;
                 foreach (var drive in _drives)
@@ -161,7 +165,6 @@ public partial class MainWindow : Window, INotifyPropertyChanged
                 if (deltaOk)
                 {
                     needFullScan = false;
-                    // Apply delta events
                     while (_eventQueue.TryDequeue(out var evt))
                     {
                         ApplyEvent(evt);
@@ -205,7 +208,6 @@ public partial class MainWindow : Window, INotifyPropertyChanged
                     Logger.Log("Cache saved.");
                 }
 
-                // Set up USN watchers for live updates
                 foreach (var drive in _drives)
                 {
                     try
@@ -222,14 +224,13 @@ public partial class MainWindow : Window, INotifyPropertyChanged
                 }
             }
 
-            // Start live update processor
             _cts = new CancellationTokenSource();
             _ = Task.Run(() => LiveUpdateLoop(_cts.Token));
 
             Dispatcher.Invoke(() =>
             {
-                StatusText.Text = $"{_index.Count} files indexed";
-                StatusBar.Visibility = Visibility.Collapsed;
+                StatusText.Text = $"{_index.Count:N0} files indexed";
+                StatusBar.Visibility = Visibility.Visible;
             });
             Logger.Log("InitializeAsync done.");
         }
@@ -257,7 +258,7 @@ public partial class MainWindow : Window, INotifyPropertyChanged
             {
                 ApplyEvent(evt);
                 processed++;
-                if (processed > 100) break; // Batch limit
+                if (processed > 100) break;
             }
             if (processed > 50)
             {
@@ -289,8 +290,6 @@ public partial class MainWindow : Window, INotifyPropertyChanged
         }
     }
 
-    // -- Window management --
-
     private IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
     {
         if (msg == WM_TOGGLE_WINDOW)
@@ -311,16 +310,31 @@ public partial class MainWindow : Window, INotifyPropertyChanged
     {
         if (_isVisible)
         {
-            Hide();
-            _isVisible = false;
+            if (Resources["FadeAnim"] is Storyboard fade)
+            {
+                fade.Completed += (s, e) => { Hide(); _isVisible = false; };
+                BeginStoryboard(fade);
+            }
+            else
+            {
+                Hide();
+                _isVisible = false;
+            }
         }
         else
         {
             CenterWindow();
+            SearchBox.Clear();
+            Results = new List<ResultItem>();
+            ShowEmptyState();
             Show();
             Activate();
             SearchBox.Focus();
-            SearchBox.SelectAll();
+
+            if (Resources["AppearAnim"] is Storyboard appear)
+            {
+                BeginStoryboard(appear);
+            }
             _isVisible = true;
         }
     }
@@ -330,11 +344,9 @@ public partial class MainWindow : Window, INotifyPropertyChanged
         var screenW = SystemParameters.PrimaryScreenWidth;
         var screenH = SystemParameters.PrimaryScreenHeight;
         Left = (screenW - Width) / 2;
-        Top = screenH * 0.22;
+        Top = screenH * 0.18;
     }
 
-    // -- Keyboard --
-
     private void Window_KeyDown(object sender, KeyEventArgs e)
     {
         switch (e.Key)
@@ -344,16 +356,18 @@ public partial class MainWindow : Window, INotifyPropertyChanged
                 e.Handled = true;
                 break;
             case Key.Down:
-                if (_selectedIndex + 1 < Results.Count)
+                if (ResultsList.Items.Count > 0 && ResultsList.SelectedIndex + 1 < ResultsList.Items.Count)
                 {
-                    UpdateSelection(_selectedIndex + 1);
+                    ResultsList.SelectedIndex++;
+                    ResultsList.ScrollIntoView(ResultsList.SelectedItem);
                     e.Handled = true;
                 }
                 break;
             case Key.Up:
-                if (_selectedIndex > 0)
+                if (ResultsList.SelectedIndex > 0)
                 {
-                    UpdateSelection(_selectedIndex - 1);
+                    ResultsList.SelectedIndex--;
+                    ResultsList.ScrollIntoView(ResultsList.SelectedItem);
                     e.Handled = true;
                 }
                 break;
@@ -369,8 +383,6 @@ public partial class MainWindow : Window, INotifyPropertyChanged
         SearchBox.Focus();
     }
 
-    // -- Search (debounced, background thread) --
-
     private void SearchBox_TextChanged(object sender, TextChangedEventArgs e)
     {
         var query = SearchBox.Text.Trim();
@@ -381,7 +393,10 @@ public partial class MainWindow : Window, INotifyPropertyChanged
             Dispatcher.Invoke(() =>
             {
                 Results = new List<ResultItem>();
-                UpdateVisibility();
+                ResultsScroll.Visibility = Visibility.Collapsed;
+                EmptyHint.Visibility = Visibility.Visible;
+                SepLine.Visibility = Visibility.Collapsed;
+                StatusText.Text = $"{_index.Count:N0} files indexed";
             });
             return;
         }
@@ -394,7 +409,6 @@ public partial class MainWindow : Window, INotifyPropertyChanged
             _searchDebounceCts = cts;
         }
 
-        // Debounce: 25ms
         Task.Run(async () =>
         {
             try
@@ -431,12 +445,33 @@ public partial class MainWindow : Window, INotifyPropertyChanged
                 if (cts.IsCancellationRequested) return;
                 _selectedIndex = 0;
                 Results = items;
-                UpdateVisibility();
+
+                if (items.Count > 0)
+                {
+                    ResultsScroll.Visibility = Visibility.Visible;
+                    EmptyHint.Visibility = Visibility.Collapsed;
+                    SepLine.Visibility = Visibility.Visible;
+                    ResultsList.SelectedIndex = 0;
+                }
+                else
+                {
+                    ResultsScroll.Visibility = Visibility.Collapsed;
+                    EmptyHint.Visibility = Visibility.Visible;
+                    EmptyHint.Text = $"No results for \"{query}\"";
+                    SepLine.Visibility = Visibility.Collapsed;
+                }
+
                 StatusText.Text = $"{items.Count} results";
+                StatusBar.Visibility = Visibility.Visible;
             });
         });
     }
 
+    private void ResultsList_SelectionChanged(object sender, SelectionChangedEventArgs e)
+    {
+        _selectedIndex = ResultsList.SelectedIndex;
+    }
+
     private void CancelPendingSearch()
     {
         lock (_searchLock)
@@ -447,45 +482,6 @@ public partial class MainWindow : Window, INotifyPropertyChanged
         }
     }
 
-    private void UpdateVisibility()
-    {
-        bool hasResults = Results.Count > 0;
-        SepLine.Visibility = hasResults ? Visibility.Visible : Visibility.Collapsed;
-        ResultsScroll.Visibility = hasResults ? Visibility.Visible : Visibility.Collapsed;
-        StatusBar.Visibility = Visibility.Visible;
-    }
-
-    private void UpdateSelection(int newIndex)
-    {
-        if (Results.Count == 0 || newIndex < 0 || newIndex >= Results.Count) return;
-
-        // Use new list to trigger PropertyChanged
-        var items = Results.Select((r, i) => r with
-        {
-            IsSelected = i == newIndex,
-            IsHovered = i == newIndex
-        }).ToList();
-        _selectedIndex = newIndex;
-        Results = items;
-
-        // Scroll selected item into view
-        if (ResultsList.ItemContainerGenerator.ContainerFromIndex(newIndex) is FrameworkElement container)
-        {
-            container.BringIntoView();
-        }
-    }
-
-    // -- Mouse --
-
-    private void ResultItem_MouseEnter(object sender, MouseEventArgs e)
-    {
-        if (sender is Border border && border.DataContext is ResultItem item)
-        {
-            int idx = Results.IndexOf(item);
-            if (idx >= 0) UpdateSelection(idx);
-        }
-    }
-
     private void ResultItem_Click(object sender, MouseButtonEventArgs e)
     {
         if (sender is Border border && border.DataContext is ResultItem item)
@@ -493,7 +489,7 @@ public partial class MainWindow : Window, INotifyPropertyChanged
             int idx = Results.IndexOf(item);
             if (idx >= 0)
             {
-                UpdateSelection(idx);
+                ResultsList.SelectedIndex = idx;
                 OpenResult(false);
             }
         }
@@ -501,8 +497,7 @@ public partial class MainWindow : Window, INotifyPropertyChanged
 
     private void OpenResult(bool folderOnly)
     {
-        if (Results.Count == 0 || _selectedIndex < 0 || _selectedIndex >= Results.Count) return;
-        var item = Results[_selectedIndex];
+        if (ResultsList.SelectedItem is not ResultItem item) return;
         string target = folderOnly
             ? (Directory.Exists(item.FullPath) ? item.FullPath : Path.GetDirectoryName(item.FullPath) ?? item.FullPath)
             : item.FullPath;
@@ -511,8 +506,6 @@ public partial class MainWindow : Window, INotifyPropertyChanged
         Hide(); _isVisible = false;
     }
 
-    // -- Helpers --
-
     private static string GetIconGlyph(ResultKind kind) => kind switch
     {
         ResultKind.App => "\uE7E8",
@@ -560,8 +553,6 @@ public partial class MainWindow : Window, INotifyPropertyChanged
     }
 }
 
-// -- Result item model --
-
 public record ResultItem
 {
     public string FullPath { get; init; } = "";