enhance: cleanup unused resources

Signed-off-by: leo <[email protected]>

Author: love-linger

src/ViewModels/Launcher.cs

@@ -44,10 +44,10 @@ public LauncherPage ActivePage
             }
         }
 
-        public object Switcher
+        public IDisposable Switcher
         {
             get => _switcher;
-            set => SetProperty(ref _switcher, value);
+            private set => SetProperty(ref _switcher, value);
         }
 
         public Launcher(string startupRepo)
@@ -148,12 +148,13 @@ public void OpenTabSwitcher()
 
         public void CancelSwitcher()
         {
+            Switcher?.Dispose();
             Switcher = null;
         }
 
         public void SwitchWorkspace(Workspace to)
         {
-            if (to.IsActive)
+            if (to == null || to.IsActive)
                 return;
 
             foreach (var one in Pages)
@@ -623,6 +624,6 @@ private void UpdateTitle()
         private LauncherPage _activePage = null;
         private bool _ignoreIndexChange = false;
         private string _title = string.Empty;
-        private object _switcher = null;
+        private IDisposable _switcher = null;
     }
 }

src/ViewModels/LauncherPageSwitcher.cs

@@ -4,14 +4,14 @@
 
 namespace SourceGit.ViewModels
 {
-    public class LauncherPageSwitcher : ObservableObject
+    public class LauncherPageSwitcher : ObservableObject, IDisposable
     {
         public List<LauncherPage> VisiblePages
         {
             get => _visiblePages;
             private set => SetProperty(ref _visiblePages, value);
         }
-        
+
         public string SearchFilter
         {
             get => _searchFilter;
@@ -27,26 +27,31 @@ public LauncherPage SelectedPage
             get => _selectedPage;
             set => SetProperty(ref _selectedPage, value);
         }
-        
+
         public LauncherPageSwitcher(Launcher launcher)
         {
             _launcher = launcher;
             UpdateVisiblePages();
         }
-        
+
         public void ClearFilter()
         {
             SearchFilter = string.Empty;
         }
 
         public void Switch()
         {
-            if (_selectedPage is { })
-                _launcher.ActivePage = _selectedPage;
-
+            _launcher.ActivePage = _selectedPage ?? _launcher.ActivePage;
             _launcher.CancelSwitcher();
         }
 
+        public void Dispose()
+        {
+            _visiblePages.Clear();
+            _selectedPage = null;
+            _searchFilter = string.Empty;
+        }
+
         private void UpdateVisiblePages()
         {
             var visible = new List<LauncherPage>();

src/ViewModels/WorkspaceSwitcher.cs

@@ -4,7 +4,7 @@
 
 namespace SourceGit.ViewModels
 {
-    public class WorkspaceSwitcher : ObservableObject
+    public class WorkspaceSwitcher : ObservableObject, IDisposable
     {
         public List<Workspace> VisibleWorkspaces
         {
@@ -41,12 +41,17 @@ public void ClearFilter()
 
         public void Switch()
         {
-            if (_selectedWorkspace is { })
-                _launcher.SwitchWorkspace(_selectedWorkspace);
-
+            _launcher.SwitchWorkspace(_selectedWorkspace);
             _launcher.CancelSwitcher();
         }
 
+        public void Dispose()
+        {
+            _visibleWorkspaces.Clear();
+            _selectedWorkspace = null;
+            _searchFilter = string.Empty;
+        }
+
         private void UpdateVisibleWorkspaces()
         {
             var visible = new List<Workspace>();

src/Views/Launcher.axaml

@@ -104,9 +104,10 @@
     </ContentControl>
 
     <!-- Workspace/Pages Switcher -->
-    <Border Grid.Row="1"
+    <Border Grid.Row="0" Grid.RowSpan="2"
             Background="Transparent"
-            IsVisible="{Binding Switcher, Converter={x:Static ObjectConverters.IsNotNull}}">
+            IsVisible="{Binding Switcher, Converter={x:Static ObjectConverters.IsNotNull}}"
+            PointerPressed="OnCancelSwitcher">
       <Border HorizontalAlignment="Center" VerticalAlignment="Center" Effect="drop-shadow(0 0 12 #A0000000)">
         <Border Background="{DynamicResource Brush.Popup}" CornerRadius="8">
           <ContentControl Margin="16,10,16,12" Content="{Binding Switcher}">

src/Views/Launcher.axaml.cs

@@ -322,6 +322,13 @@ private void OnOpenWorkspaceMenu(object sender, RoutedEventArgs e)
             e.Handled = true;
         }
 
+        private void OnCancelSwitcher(object sender, PointerPressedEventArgs e)
+        {
+            if (e.Source == sender)
+                (DataContext as ViewModels.Launcher)?.CancelSwitcher();
+            e.Handled = true;
+        }
+
         private KeyModifiers _unhandledModifiers = KeyModifiers.None;
         private WindowState _lastWindowState = WindowState.Normal;
     }

src/Views/LauncherPageSwitcher.axaml.cs

@@ -9,7 +9,7 @@ public LauncherPageSwitcher()
         {
             InitializeComponent();
         }
-        
+
         protected override void OnKeyDown(KeyEventArgs e)
         {
             base.OnKeyDown(e);

src/Views/LauncherTabBar.axaml

@@ -141,7 +141,7 @@
 
       <Button x:Name="PageSelector" Classes="icon_button" Width="16" Height="16" Margin="8,0">
         <Button.Flyout>
-          <Flyout Opened="OnTabsDropdownOpened">
+          <Flyout Opened="OnTabsDropdownOpened" Closed="OnTabsDropdownClosed">
             <Grid RowDefinitions="28,Auto" KeyDown="OnTabsDropdownKeyDown" LostFocus="OnTabsDropdownLostFocus">
               <TextBox Grid.Row="0"
                        Height="24"

src/Views/LauncherTabBar.axaml.cs

@@ -19,7 +19,7 @@ public bool IsScrollerVisible
             get => GetValue(IsScrollerVisibleProperty);
             set => SetValue(IsScrollerVisibleProperty, value);
         }
-        
+
         public static readonly StyledProperty<string> SearchFilterProperty =
             AvaloniaProperty.Register<LauncherTabBar, string>(nameof(SearchFilter));
 
@@ -140,15 +140,15 @@ public override void Render(DrawingContext context)
             var stroke = new Pen(this.FindResource("Brush.Border0") as IBrush);
             context.DrawGeometry(fill, stroke, geo);
         }
-        
+
         protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
 
             if (change.Property == SearchFilterProperty)
                 UpdateSelectablePages();
         }
-        
+
         private void ScrollTabs(object _, PointerWheelEventArgs e)
         {
             if (!e.KeyModifiers.HasFlag(KeyModifiers.Shift))
@@ -270,12 +270,18 @@ private void OnCloseTab(object sender, RoutedEventArgs e)
 
             e.Handled = true;
         }
-        
+
         private void OnTabsDropdownOpened(object sender, EventArgs e)
         {
             UpdateSelectablePages();
         }
-        
+
+        private void OnTabsDropdownClosed(object sender, EventArgs e)
+        {
+            SelectablePages.Clear();
+            SearchFilter = string.Empty;
+        }
+
         private void OnTabsDropdownKeyDown(object sender, KeyEventArgs e)
         {
             if (e.Key == Key.Escape)
@@ -294,7 +300,7 @@ private void OnTabsDropdownKeyDown(object sender, KeyEventArgs e)
                 }
             }
         }
-        
+
         private void OnTabsDropdownSearchBoxKeyDown(object sender, KeyEventArgs e)
         {
             if (e.Key == Key.Down && TabsDropdownList.ItemCount > 0)
@@ -355,7 +361,7 @@ private void UpdateSelectablePages()
                     SelectablePages.Add(page);
             }
         }
-        
+
         private bool _pressedTab = false;
         private Point _pressedTabPosition = new Point();
         private bool _startDragTab = false;