From 52ca49ac85663a24359728c9ad4a5fb67faa4008 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ebbe=20Ba=C3=9F?= <ebbe.bass@bechtle.com>
Date: Wed, 19 Aug 2026 15:23:49 +0200
Subject: [PATCH] added scroll reset and tab persistance

---
 src/EbbesMemeClipboard/Models/AppSettings.cs  |  9 +++++++++
 .../ViewModels/PickerViewModel.cs             | 20 ++++++++++++++++++-
 .../Views/PickerWindow.xaml                   |  3 ++-
 .../Views/PickerWindow.xaml.cs                | 11 ++++++++++
 4 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/src/EbbesMemeClipboard/Models/AppSettings.cs b/src/EbbesMemeClipboard/Models/AppSettings.cs
index 4c39160..35733e1 100644
--- a/src/EbbesMemeClipboard/Models/AppSettings.cs
+++ b/src/EbbesMemeClipboard/Models/AppSettings.cs
@@ -20,4 +20,13 @@ public sealed class AppSettings
     /// costs noticeably more CPU and memory than showing static first frames.
     /// </summary>
     public bool PlayGifPreviews { get; set; }
+
+    /// <summary>
+    /// Which tab the picker reopens on. Persisted so the choice survives an app restart, not
+    /// just a hide/show. Defaults to the favourites view, since that is where the memes you
+    /// actually reach for most often live.
+    /// </summary>
+    public MemeSource LastSource { get; set; } = MemeSource.Local;
+
+    public bool LastShowingFavorites { get; set; } = true;
 }
diff --git a/src/EbbesMemeClipboard/ViewModels/PickerViewModel.cs b/src/EbbesMemeClipboard/ViewModels/PickerViewModel.cs
index de72872..1b53839 100644
--- a/src/EbbesMemeClipboard/ViewModels/PickerViewModel.cs
+++ b/src/EbbesMemeClipboard/ViewModels/PickerViewModel.cs
@@ -99,7 +99,16 @@ public partial class PickerViewModel : ObservableObject
         _providers = providers.ToList();
 
         Items.CollectionChanged += OnItemsChanged;
-        RefreshLocalItems();
+
+        // Restore the tab the picker was last left on. Assigned to the backing fields directly
+        // so restoring doesn't count as a user change and immediately re-save.
+        _activeSource = _settings.Current.LastSource;
+        _showingFavorites = _settings.Current.LastShowingFavorites;
+
+        // Seed the grid for the restored view. Remote sources are skipped here because that
+        // needs an async call - OnShown covers it when the window is actually opened.
+        if (_showingFavorites) RefreshFavoriteItems();
+        else if (IsLocalSource) RefreshLocalItems();
     }
 
     private void OnItemsChanged(object? sender, NotifyCollectionChangedEventArgs e) =>
@@ -116,6 +125,7 @@ public partial class PickerViewModel : ObservableObject
         OnPropertyChanged(nameof(EmptyStateText));
         OnPropertyChanged(nameof(ShowEmptyState));
         SearchText = string.Empty;
+        PersistViewState();
         _ = RefreshAsync();
     }
 
@@ -127,11 +137,19 @@ public partial class PickerViewModel : ObservableObject
         OnPropertyChanged(nameof(CanImport));
         OnPropertyChanged(nameof(ShowEmptyState));
         SearchText = string.Empty;
+        PersistViewState();
         // Setting SearchText above only triggers a refresh if the value actually changed, so
         // refresh explicitly here to cover switching tabs with an already-empty box.
         _ = RefreshAsync();
     }
 
+    private void PersistViewState()
+    {
+        _settings.Current.LastSource = ActiveSource;
+        _settings.Current.LastShowingFavorites = ShowingFavorites;
+        _ = _settings.SaveAsync();
+    }
+
     [RelayCommand]
     private void SelectSource(MemeSource source) => ActiveSource = source;
 
diff --git a/src/EbbesMemeClipboard/Views/PickerWindow.xaml b/src/EbbesMemeClipboard/Views/PickerWindow.xaml
index aa1f7ac..1a3641b 100644
--- a/src/EbbesMemeClipboard/Views/PickerWindow.xaml
+++ b/src/EbbesMemeClipboard/Views/PickerWindow.xaml
@@ -202,7 +202,8 @@
                         ToolTip="Add memes"/>
             </Grid>
 
-            <ScrollViewer Grid.Row="3" VerticalScrollBarVisibility="Auto" Padding="0,0,4,0"
+            <ScrollViewer x:Name="ResultsScrollViewer"
+                          Grid.Row="3" VerticalScrollBarVisibility="Auto" Padding="0,0,4,0"
                           ScrollChanged="ResultsScrollViewer_OnScrollChanged">
                 <Grid>
                     <TextBlock Text="{Binding EmptyStateText}"
diff --git a/src/EbbesMemeClipboard/Views/PickerWindow.xaml.cs b/src/EbbesMemeClipboard/Views/PickerWindow.xaml.cs
index c70f17b..ebefc94 100644
--- a/src/EbbesMemeClipboard/Views/PickerWindow.xaml.cs
+++ b/src/EbbesMemeClipboard/Views/PickerWindow.xaml.cs
@@ -29,6 +29,8 @@ public partial class PickerWindow : Window
         _autoPaste.CaptureForegroundWindow();
         PositionNearCursor();
         _viewModel.OnShown();
+        // Always reopen at the top rather than wherever the last session was left scrolled to.
+        ResultsScrollViewer.ScrollToTop();
         Show();
         Activate();
         SearchBox.Focus();
@@ -88,6 +90,15 @@ public partial class PickerWindow : Window
         {
             Activate();
         }
+
+        // Switching tab/view or typing replaces the whole grid, so a retained scroll offset
+        // would leave the user part-way down a completely different set of results.
+        if (e.PropertyName is nameof(PickerViewModel.ActiveSource)
+            or nameof(PickerViewModel.ShowingFavorites)
+            or nameof(PickerViewModel.SearchText))
+        {
+            ResultsScrollViewer.ScrollToTop();
+        }
     }
 
     private void PickerWindow_OnDeactivated(object? sender, EventArgs e)