feature: support using left/right arrow to expand/collapse tree node (sourcegit-scm#463)

love-linger · love-linger · commit 07cba1cf5ffb · 2024-09-22T20:48:36.000+08:00
diff --git a/src/Views/ChangeCollectionView.axaml.cs b/src/Views/ChangeCollectionView.axaml.cs
@@ -33,7 +33,16 @@ public class ChangeCollectionContainer : ListBox
 
         protected override void OnKeyDown(KeyEventArgs e)
         {
-            if (e.Key != Key.Space)
+            if (SelectedItems is [ViewModels.ChangeTreeNode { IsFolder: true } node] && e.KeyModifiers == KeyModifiers.None)
+            {
+                if ((node.IsExpanded && e.Key == Key.Left) || (!node.IsExpanded && e.Key == Key.Right))
+                {
+                    this.FindAncestorOfType<ChangeCollectionView>()?.ToggleNodeIsExpanded(node);
+                    e.Handled = true;
+                }
+            }
+            
+            if (!e.Handled && e.Key != Key.Space)
                 base.OnKeyDown(e);
         }
     }
@@ -157,13 +166,11 @@ public Models.Change GetNextChangeWithoutSelection()
                         {
                             if (lastUnselected == -1)
                                 continue;
-                            else
-                                break;
-                        }
-                        else
-                        {
-                            lastUnselected = i;
+                            
+                            break;
                         }
+                        
+                        lastUnselected = i;
                     }
                 }
 
@@ -179,13 +186,11 @@ public Models.Change GetNextChangeWithoutSelection()
                     {
                         if (lastUnselected == -1)
                             continue;
-                        else
-                            break;
-                    }
-                    else
-                    {
-                        lastUnselected = i;
+                        
+                        break;
                     }
+                    
+                    lastUnselected = i;
                 }
 
                 if (lastUnselected != -1)
@@ -239,9 +244,9 @@ private void OnRowSelectionChanged(object sender, SelectionChangedEventArgs _)
             _disableSelectionChangingEvent = true;
 
             var selected = new List<Models.Change>();
-            if (sender is ListBox list)
+            if (sender is ListBox { SelectedItems: {} selectedItems })
             {
-                foreach (var item in list.SelectedItems)
+                foreach (var item in selectedItems)
                 {
                     if (item is Models.Change c)
                         selected.Add(c);
diff --git a/src/Views/RevisionFileTreeView.axaml b/src/Views/RevisionFileTreeView.axaml
@@ -8,12 +8,12 @@
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="SourceGit.Views.RevisionFileTreeView"
              x:Name="ThisControl">
-  <ListBox ItemsSource="{Binding #ThisControl.Rows}"
-           Background="Transparent"
-           SelectionMode="Single"
-           SelectionChanged="OnRowsSelectionChanged"
-           ScrollViewer.HorizontalScrollBarVisibility="Auto"
-           ScrollViewer.VerticalScrollBarVisibility="Auto">
+  <v:RevisionFileRowsListBox ItemsSource="{Binding #ThisControl.Rows}"
+                             Background="Transparent"
+                             SelectionMode="Single"
+                             SelectionChanged="OnRowsSelectionChanged"
+                             ScrollViewer.HorizontalScrollBarVisibility="Auto"
+                             ScrollViewer.VerticalScrollBarVisibility="Auto">
     <ListBox.ItemsPanel>
       <ItemsPanelTemplate>
         <VirtualizingStackPanel Orientation="Vertical"/>
@@ -46,5 +46,5 @@
         </Grid>
       </DataTemplate>
     </ListBox.ItemTemplate>
-  </ListBox>
+  </v:RevisionFileRowsListBox>
 </UserControl>
diff --git a/src/Views/RevisionFileTreeView.axaml.cs b/src/Views/RevisionFileTreeView.axaml.cs
@@ -103,6 +103,26 @@ private void CreateContent(string iconKey, Thickness margin, IBrush fill = null)
         }
     }
 
+    public class RevisionFileRowsListBox : ListBox
+    {
+        protected override Type StyleKeyOverride => typeof(ListBox);
+
+        protected override void OnKeyDown(KeyEventArgs e)
+        {
+            if (SelectedItems is [ViewModels.RevisionFileTreeNode { IsFolder: true } node] && e.KeyModifiers == KeyModifiers.None)
+            {
+                if ((node.IsExpanded && e.Key == Key.Left) || (!node.IsExpanded && e.Key == Key.Right))
+                {
+                    this.FindAncestorOfType<RevisionFileTreeView>()?.ToggleNodeIsExpanded(node);
+                    e.Handled = true;
+                }
+            }
+            
+            if (!e.Handled)
+                base.OnKeyDown(e);
+        }
+    }
+
     public partial class RevisionFileTreeView : UserControl
     {
         public static readonly StyledProperty<string> RevisionProperty =
@@ -285,8 +305,8 @@ private void MakeRows(List<ViewModels.RevisionFileTreeNode> rows, List<ViewModel
             }
         }
 
-        private List<ViewModels.RevisionFileTreeNode> _tree = new List<ViewModels.RevisionFileTreeNode>();
-        private AvaloniaList<ViewModels.RevisionFileTreeNode> _rows = new AvaloniaList<ViewModels.RevisionFileTreeNode>();
+        private List<ViewModels.RevisionFileTreeNode> _tree = [];
+        private AvaloniaList<ViewModels.RevisionFileTreeNode> _rows = [];
         private bool _disableSelectionChangingEvent = false;
     }
 }
diff --git a/src/Views/Welcome.axaml b/src/Views/Welcome.axaml
@@ -45,18 +45,18 @@
         </TextBox>
 
         <!-- Repository Tree -->
-        <ListBox Grid.Row="1"
-                 x:Name="TreeContainer"
-                 Margin="0,8,8,0"
-                 Focusable="True"
-                 Background="Transparent"
-                 ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-                 ScrollViewer.VerticalScrollBarVisibility="Auto"
-                 ItemsSource="{Binding Rows}"
-                 SelectionMode="Single"
-                 Loaded="SetupTreeViewDragAndDrop"
-                 LostFocus="OnTreeViewLostFocus"
-                 KeyDown="OnTreeViewKeyDown">
+        <v:RepositoryListBox Grid.Row="1"
+                             x:Name="TreeContainer"
+                             Margin="0,8,8,0"
+                             Focusable="True"
+                             Background="Transparent"
+                             ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                             ScrollViewer.VerticalScrollBarVisibility="Auto"
+                             ItemsSource="{Binding Rows}"
+                             SelectionMode="Single"
+                             Loaded="SetupTreeViewDragAndDrop"
+                             LostFocus="OnTreeViewLostFocus"
+                             KeyDown="OnTreeViewKeyDown">
           <ListBox.Styles>
             <Style Selector="ListBox">
               <Setter Property="FocusAdorner">
@@ -145,7 +145,7 @@
               </Grid>
             </DataTemplate>
           </ListBox.ItemTemplate>
-        </ListBox>
+        </v:RepositoryListBox>
       </Grid>
     </Grid>
 
diff --git a/src/Views/Welcome.axaml.cs b/src/Views/Welcome.axaml.cs
@@ -25,6 +25,26 @@ protected override void OnPointerPressed(PointerPressedEventArgs e)
             e.Handled = true;
         }
     }
+    
+    public class RepositoryListBox : ListBox
+    {
+        protected override Type StyleKeyOverride => typeof(ListBox);
+
+        protected override void OnKeyDown(KeyEventArgs e)
+        {
+            if (SelectedItems is [ViewModels.RepositoryNode { IsRepository: false } node] && e.KeyModifiers == KeyModifiers.None)
+            {
+                if ((node.IsExpanded && e.Key == Key.Left) || (!node.IsExpanded && e.Key == Key.Right))
+                {
+                    ViewModels.Welcome.Instance.ToggleNodeIsExpanded(node);
+                    e.Handled = true;
+                }
+            }
+            
+            if (!e.Handled)
+                base.OnKeyDown(e);
+        }
+    }
 
     public partial class Welcome : UserControl
     {

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,16 @@ public class ChangeCollectionContainer : ListBox`
`33`	`33`
`34`	`34`	`protected override void OnKeyDown(KeyEventArgs e)`
`35`	`35`	`{`
`36`		`- if (e.Key != Key.Space)`
	`36`	`+ if (SelectedItems is [ViewModels.ChangeTreeNode { IsFolder: true } node] && e.KeyModifiers == KeyModifiers.None)`
	`37`	`+ {`
	`38`	`+ if ((node.IsExpanded && e.Key == Key.Left) \|\| (!node.IsExpanded && e.Key == Key.Right))`
	`39`	`+ {`
	`40`	`+ this.FindAncestorOfType<ChangeCollectionView>()?.ToggleNodeIsExpanded(node);`
	`41`	`+ e.Handled = true;`
	`42`	`+ }`
	`43`	`+ }`
	`44`	`+`
	`45`	`+ if (!e.Handled && e.Key != Key.Space)`
`37`	`46`	`base.OnKeyDown(e);`
`38`	`47`	`}`
`39`	`48`	`}`
`@@ -157,13 +166,11 @@ public Models.Change GetNextChangeWithoutSelection()`
`157`	`166`	`{`
`158`	`167`	`if (lastUnselected == -1)`
`159`	`168`	`continue;`
`160`		`- else`
`161`		`- break;`
`162`		`- }`
`163`		`- else`
`164`		`- {`
`165`		`- lastUnselected = i;`
	`169`	`+`
	`170`	`+ break;`
`166`	`171`	`}`
	`172`	`+`
	`173`	`+ lastUnselected = i;`
`167`	`174`	`}`
`168`	`175`	`}`
`169`	`176`
`@@ -179,13 +186,11 @@ public Models.Change GetNextChangeWithoutSelection()`
`179`	`186`	`{`
`180`	`187`	`if (lastUnselected == -1)`
`181`	`188`	`continue;`
`182`		`- else`
`183`		`- break;`
`184`		`- }`
`185`		`- else`
`186`		`- {`
`187`		`- lastUnselected = i;`
	`189`	`+`
	`190`	`+ break;`
`188`	`191`	`}`
	`192`	`+`
	`193`	`+ lastUnselected = i;`
`189`	`194`	`}`
`190`	`195`
`191`	`196`	`if (lastUnselected != -1)`
`@@ -239,9 +244,9 @@ private void OnRowSelectionChanged(object sender, SelectionChangedEventArgs _)`
`239`	`244`	`_disableSelectionChangingEvent = true;`
`240`	`245`
`241`	`246`	`var selected = new List<Models.Change>();`
`242`		`- if (sender is ListBox list)`
	`247`	`+ if (sender is ListBox { SelectedItems: {} selectedItems })`
`243`	`248`	`{`
`244`		`- foreach (var item in list.SelectedItems)`
	`249`	`+ foreach (var item in selectedItems)`
`245`	`250`	`{`
`246`	`251`	`if (item is Models.Change c)`
`247`	`252`	`selected.Add(c);`
Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,26 @@ private void CreateContent(string iconKey, Thickness margin, IBrush fill = null)`
`103`	`103`	`}`
`104`	`104`	`}`
`105`	`105`
	`106`	`+ public class RevisionFileRowsListBox : ListBox`
	`107`	`+ {`
	`108`	`+ protected override Type StyleKeyOverride => typeof(ListBox);`
	`109`	`+`
	`110`	`+ protected override void OnKeyDown(KeyEventArgs e)`
	`111`	`+ {`
	`112`	`+ if (SelectedItems is [ViewModels.RevisionFileTreeNode { IsFolder: true } node] && e.KeyModifiers == KeyModifiers.None)`
	`113`	`+ {`
	`114`	`+ if ((node.IsExpanded && e.Key == Key.Left) \|\| (!node.IsExpanded && e.Key == Key.Right))`
	`115`	`+ {`
	`116`	`+ this.FindAncestorOfType<RevisionFileTreeView>()?.ToggleNodeIsExpanded(node);`
	`117`	`+ e.Handled = true;`
	`118`	`+ }`
	`119`	`+ }`
	`120`	`+`
	`121`	`+ if (!e.Handled)`
	`122`	`+ base.OnKeyDown(e);`
	`123`	`+ }`
	`124`	`+ }`
	`125`	`+`
`106`	`126`	`public partial class RevisionFileTreeView : UserControl`
`107`	`127`	`{`
`108`	`128`	`public static readonly StyledProperty<string> RevisionProperty =`
`@@ -285,8 +305,8 @@ private void MakeRows(List<ViewModels.RevisionFileTreeNode> rows, List<ViewModel`
`285`	`305`	`}`
`286`	`306`	`}`
`287`	`307`
`288`		`- private List<ViewModels.RevisionFileTreeNode> _tree = new List<ViewModels.RevisionFileTreeNode>();`
`289`		`- private AvaloniaList<ViewModels.RevisionFileTreeNode> _rows = new AvaloniaList<ViewModels.RevisionFileTreeNode>();`
	`308`	`+ private List<ViewModels.RevisionFileTreeNode> _tree = [];`
	`309`	`+ private AvaloniaList<ViewModels.RevisionFileTreeNode> _rows = [];`
`290`	`310`	`private bool _disableSelectionChangingEvent = false;`
`291`	`311`	`}`
`292`	`312`	`}`