refactor: more efficient way to update the visibility of tab splitters

love-linger · love-linger · commit 5514c56a298f · 2024-06-06T18:09:35.000+08:00
diff --git a/src/Converters/LauncherPageConverters.cs b/src/Converters/LauncherPageConverters.cs
diff --git a/src/ViewModels/Launcher.cs b/src/ViewModels/Launcher.cs
@@ -23,6 +23,7 @@ public LauncherPage ActivePage
                 if (SetProperty(ref _activePage, value))
                 {
                     PopupHost.Active = value;
+                    UpdateTabSplitterVisible();
                 }
             }
         }
@@ -157,13 +158,12 @@ public void CloseTab(object param)
                 ActivePage = Pages[removeIdx == Pages.Count - 1 ? removeIdx - 1 : removeIdx + 1];
                 CloseRepositoryInTab(page);
                 Pages.RemoveAt(removeIdx);
-                OnPropertyChanged(nameof(Pages));
             }
             else if (removeIdx + 1 == activeIdx)
             {
                 CloseRepositoryInTab(page);
                 Pages.RemoveAt(removeIdx);
-                OnPropertyChanged(nameof(Pages));
+                UpdateTabSplitterVisible();
             }
             else
             {
@@ -174,42 +174,25 @@ public void CloseTab(object param)
             GC.Collect();
         }
 
-        public void CloseOtherTabs(object param)
+        public void CloseOtherTabs()
         {
             if (Pages.Count == 1)
                 return;
 
-            var page = param as LauncherPage;
-            if (page == null)
-                page = _activePage;
-
-            ActivePage = page;
-
+            var id = ActivePage.Node.Id;
             foreach (var one in Pages)
             {
-                if (one.Node.Id != page.Node.Id)
+                if (one.Node.Id != id)
                     CloseRepositoryInTab(one);
             }
 
-            Pages = new AvaloniaList<LauncherPage> { page };
-            OnPropertyChanged(nameof(Pages));
-
+            Pages = new AvaloniaList<LauncherPage> { ActivePage };
             GC.Collect();
         }
 
-        public void CloseRightTabs(object param)
+        public void CloseRightTabs()
         {
-            LauncherPage page = param as LauncherPage;
-            if (page == null)
-                page = _activePage;
-
-            var endIdx = Pages.IndexOf(page);
-            var activeIdx = Pages.IndexOf(_activePage);
-            if (endIdx < activeIdx)
-            {
-                ActivePage = page;
-            }
-
+            var endIdx = Pages.IndexOf(ActivePage);
             for (var i = Pages.Count - 1; i > endIdx; i--)
             {
                 CloseRepositoryInTab(Pages[i]);
@@ -275,6 +258,13 @@ private void CloseRepositoryInTab(LauncherPage page)
             page.Data = null;
         }
 
+        private void UpdateTabSplitterVisible()
+        {
+            var activePageIdx = ActivePage == null ? -1 : Pages.IndexOf(ActivePage);
+            for (int i = 0; i < Pages.Count; i++)
+                Pages[i].IsTabSplitterVisible = (activePageIdx != i && activePageIdx != i + 1);
+        }
+
         private LauncherPage _activePage = null;
     }
 }
diff --git a/src/ViewModels/LauncherPage.cs b/src/ViewModels/LauncherPage.cs
@@ -18,6 +18,12 @@ public object Data
             set => SetProperty(ref _data, value);
         }
 
+        public bool IsTabSplitterVisible
+        {
+            get => _isTabSplitterVisible;
+            set => SetProperty(ref _isTabSplitterVisible, value);
+        }
+
         public AvaloniaList<Models.Notification> Notifications
         {
             get;
@@ -50,12 +56,11 @@ public void CopyPath()
         public void DismissNotification(object param)
         {
             if (param is Models.Notification notice)
-            {
                 Notifications.Remove(notice);
-            }
         }
 
         private RepositoryNode _node = null;
         private object _data = null;
+        private bool _isTabSplitterVisible = true;
     }
 }
diff --git a/src/Views/Launcher.axaml b/src/Views/Launcher.axaml
@@ -125,11 +125,9 @@
                                   CommandParameter="{Binding}"
                                   InputGesture="{OnPlatform Ctrl+W, macOS=⌘+W}"/>
                         <MenuItem Header="{DynamicResource Text.PageTabBar.Tab.CloseOther}"
-                                  Command="{Binding #me.((vm:Launcher)DataContext).CloseOtherTabs}"
-                                  CommandParameter="{Binding}"/>
+                                  Command="{Binding #me.((vm:Launcher)DataContext).CloseOtherTabs}"/>
                         <MenuItem Header="{DynamicResource Text.PageTabBar.Tab.CloseRight}"
-                                  Command="{Binding #me.((vm:Launcher)DataContext).CloseRightTabs}"
-                                  CommandParameter="{Binding}"/>
+                                  Command="{Binding #me.((vm:Launcher)DataContext).CloseRightTabs}"/>
                         <MenuItem Header="-" IsVisible="{Binding Node.IsRepository}"/>
                         <MenuItem IsVisible="{Binding Node.IsRepository}">
                           <MenuItem.Header>
@@ -210,15 +208,11 @@
                         </ToolTip.Tip>
                         <Path Width="8" Height="8" Data="{StaticResource Icons.Window.Close}"/>
                       </Button>
-                      <Rectangle Grid.Column="2" Width=".5" Height="20" HorizontalAlignment="Right" VerticalAlignment="Center" Fill="{DynamicResource Brush.FG2}">
-                        <Rectangle.IsVisible>
-                          <MultiBinding Converter="{x:Static c:LauncherPageConverters.ToTabSeperatorVisible}">
-                            <Binding/>
-                            <Binding Path="$parent[ListBox].SelectedItem"/>
-                            <Binding Path="#me.((vm:Launcher)DataContext).Pages"/>
-                          </MultiBinding>
-                        </Rectangle.IsVisible>
-                      </Rectangle>
+                      <Rectangle Grid.Column="2" 
+                                 Width=".5" Height="20" 
+                                 HorizontalAlignment="Right" VerticalAlignment="Center" 
+                                 Fill="{DynamicResource Brush.FG2}"
+                                 IsVisible="{Binding IsTabSplitterVisible}"/>
                     </Grid>
                   </Border>
                 </DataTemplate>

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ public LauncherPage ActivePage`
`23`	`23`	`if (SetProperty(ref _activePage, value))`
`24`	`24`	`{`
`25`	`25`	`PopupHost.Active = value;`
	`26`	`+ UpdateTabSplitterVisible();`
`26`	`27`	`}`
`27`	`28`	`}`
`28`	`29`	`}`
`@@ -157,13 +158,12 @@ public void CloseTab(object param)`
`157`	`158`	`ActivePage = Pages[removeIdx == Pages.Count - 1 ? removeIdx - 1 : removeIdx + 1];`
`158`	`159`	`CloseRepositoryInTab(page);`
`159`	`160`	`Pages.RemoveAt(removeIdx);`
`160`		`- OnPropertyChanged(nameof(Pages));`
`161`	`161`	`}`
`162`	`162`	`else if (removeIdx + 1 == activeIdx)`
`163`	`163`	`{`
`164`	`164`	`CloseRepositoryInTab(page);`
`165`	`165`	`Pages.RemoveAt(removeIdx);`
`166`		`- OnPropertyChanged(nameof(Pages));`
	`166`	`+ UpdateTabSplitterVisible();`
`167`	`167`	`}`
`168`	`168`	`else`
`169`	`169`	`{`
`@@ -174,42 +174,25 @@ public void CloseTab(object param)`
`174`	`174`	`GC.Collect();`
`175`	`175`	`}`
`176`	`176`
`177`		`- public void CloseOtherTabs(object param)`
	`177`	`+ public void CloseOtherTabs()`
`178`	`178`	`{`
`179`	`179`	`if (Pages.Count == 1)`
`180`	`180`	`return;`
`181`	`181`
`182`		`- var page = param as LauncherPage;`
`183`		`- if (page == null)`
`184`		`- page = _activePage;`
`185`		`-`
`186`		`- ActivePage = page;`
`187`		`-`
	`182`	`+ var id = ActivePage.Node.Id;`
`188`	`183`	`foreach (var one in Pages)`
`189`	`184`	`{`
`190`		`- if (one.Node.Id != page.Node.Id)`
	`185`	`+ if (one.Node.Id != id)`
`191`	`186`	`CloseRepositoryInTab(one);`
`192`	`187`	`}`
`193`	`188`
`194`		`- Pages = new AvaloniaList<LauncherPage> { page };`
`195`		`- OnPropertyChanged(nameof(Pages));`
`196`		`-`
	`189`	`+ Pages = new AvaloniaList<LauncherPage> { ActivePage };`
`197`	`190`	`GC.Collect();`
`198`	`191`	`}`
`199`	`192`
`200`		`- public void CloseRightTabs(object param)`
	`193`	`+ public void CloseRightTabs()`
`201`	`194`	`{`
`202`		`- LauncherPage page = param as LauncherPage;`
`203`		`- if (page == null)`
`204`		`- page = _activePage;`
`205`		`-`
`206`		`- var endIdx = Pages.IndexOf(page);`
`207`		`- var activeIdx = Pages.IndexOf(_activePage);`
`208`		`- if (endIdx < activeIdx)`
`209`		`- {`
`210`		`- ActivePage = page;`
`211`		`- }`
`212`		`-`
	`195`	`+ var endIdx = Pages.IndexOf(ActivePage);`
`213`	`196`	`for (var i = Pages.Count - 1; i > endIdx; i--)`
`214`	`197`	`{`
`215`	`198`	`CloseRepositoryInTab(Pages[i]);`
`@@ -275,6 +258,13 @@ private void CloseRepositoryInTab(LauncherPage page)`
`275`	`258`	`page.Data = null;`
`276`	`259`	`}`
`277`	`260`
	`261`	`+ private void UpdateTabSplitterVisible()`
	`262`	`+ {`
	`263`	`+ var activePageIdx = ActivePage == null ? -1 : Pages.IndexOf(ActivePage);`
	`264`	`+ for (int i = 0; i < Pages.Count; i++)`
	`265`	`+ Pages[i].IsTabSplitterVisible = (activePageIdx != i && activePageIdx != i + 1);`
	`266`	`+ }`
	`267`	`+`
`278`	`268`	`private LauncherPage _activePage = null;`
`279`	`269`	`}`
`280`	`270`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,12 @@ public object Data`
`18`	`18`	`set => SetProperty(ref _data, value);`
`19`	`19`	`}`
`20`	`20`
	`21`	`+ public bool IsTabSplitterVisible`
	`22`	`+ {`
	`23`	`+ get => _isTabSplitterVisible;`
	`24`	`+ set => SetProperty(ref _isTabSplitterVisible, value);`
	`25`	`+ }`
	`26`	`+`
`21`	`27`	`public AvaloniaList<Models.Notification> Notifications`
`22`	`28`	`{`
`23`	`29`	`get;`
`@@ -50,12 +56,11 @@ public void CopyPath()`
`50`	`56`	`public void DismissNotification(object param)`
`51`	`57`	`{`
`52`	`58`	`if (param is Models.Notification notice)`
`53`		`- {`
`54`	`59`	`Notifications.Remove(notice);`
`55`		`- }`
`56`	`60`	`}`
`57`	`61`
`58`	`62`	`private RepositoryNode _node = null;`
`59`	`63`	`private object _data = null;`
	`64`	`+ private bool _isTabSplitterVisible = true;`
`60`	`65`	`}`
`61`	`66`	`}`