From 93a2edd8a868fdfd55fe3c00f12c68f81c09c375 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 22 Aug 2025 10:02:47 +0800
Subject: [PATCH] enhance: text search in ComboBox

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Views/AddWorktree.axaml    | 1 +
 src/Views/AddWorktree.axaml.cs | 1 +
 src/Views/Pull.axaml           | 1 +
 src/Views/Pull.axaml.cs        | 3 +++
 src/Views/Push.axaml           | 2 ++
 src/Views/Push.axaml.cs        | 4 ++++
 src/Views/SetUpstream.axaml    | 1 +
 src/Views/SetUpstream.axaml.cs | 3 +++
 8 files changed, 16 insertions(+)

diff --git a/src/Views/AddWorktree.axaml b/src/Views/AddWorktree.axaml
index 1811008c..6ab3360b 100644
--- a/src/Views/AddWorktree.axaml
+++ b/src/Views/AddWorktree.axaml
@@ -80,6 +80,7 @@
                 Height="28" Padding="8,0"
                 VerticalAlignment="Center" HorizontalAlignment="Stretch"
                 ItemsSource="{Binding RemoteBranches}"
+                IsTextSearchEnabled="True"
                 SelectedItem="{Binding SelectedTrackingBranch, Mode=TwoWay}"
                 IsVisible="{Binding SetTrackingBranch, Mode=OneWay}">
         <ComboBox.ItemTemplate>
diff --git a/src/Views/AddWorktree.axaml.cs b/src/Views/AddWorktree.axaml.cs
index 4ac2d85f..f5d90d55 100644
--- a/src/Views/AddWorktree.axaml.cs
+++ b/src/Views/AddWorktree.axaml.cs
@@ -1,4 +1,5 @@
 using System;
+
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.Platform.Storage;
diff --git a/src/Views/Pull.axaml b/src/Views/Pull.axaml
index 5fc2ecd3..df1fe4d6 100644
--- a/src/Views/Pull.axaml
+++ b/src/Views/Pull.axaml
@@ -46,6 +46,7 @@
                  Margin="0,0,8,0"
                  Text="{DynamicResource Text.Pull.Branch}"/>
       <ComboBox Grid.Row="1" Grid.Column="1"
+                x:Name="RemoteBranchesComboBox"
                 Height="28" Padding="8,0"
                 VerticalAlignment="Center" HorizontalAlignment="Stretch"
                 ItemsSource="{Binding RemoteBranches}"
diff --git a/src/Views/Pull.axaml.cs b/src/Views/Pull.axaml.cs
index c6b4923e..c9b92c24 100644
--- a/src/Views/Pull.axaml.cs
+++ b/src/Views/Pull.axaml.cs
@@ -1,4 +1,6 @@
 using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Data;
 
 namespace SourceGit.Views
 {
@@ -7,6 +9,7 @@ namespace SourceGit.Views
         public Pull()
         {
             InitializeComponent();
+            TextSearch.SetTextBinding(RemoteBranchesComboBox, new Binding("Name"));
         }
     }
 }
diff --git a/src/Views/Push.axaml b/src/Views/Push.axaml
index c9c140b1..ae015c88 100644
--- a/src/Views/Push.axaml
+++ b/src/Views/Push.axaml
@@ -18,6 +18,7 @@
                  Margin="0,0,8,0"
                  Text="{DynamicResource Text.Push.Local}"/>
       <ComboBox Grid.Row="0" Grid.Column="1"
+                x:Name="LocalBranchesComboBox"
                 Height="28" Padding="8,0"
                 VerticalAlignment="Center" HorizontalAlignment="Stretch"
                 ItemsSource="{Binding LocalBranches}"
@@ -58,6 +59,7 @@
                  Margin="0,0,8,0"
                  Text="{DynamicResource Text.Push.To}"/>
       <ComboBox Grid.Row="2" Grid.Column="1"
+                x:Name="RemoteBranchesComboBox"
                 Height="28" Padding="8,0"
                 VerticalAlignment="Center" HorizontalAlignment="Stretch"
                 ItemsSource="{Binding RemoteBranches}"
diff --git a/src/Views/Push.axaml.cs b/src/Views/Push.axaml.cs
index 9a0b2125..98c620f7 100644
--- a/src/Views/Push.axaml.cs
+++ b/src/Views/Push.axaml.cs
@@ -1,4 +1,6 @@
 using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Data;
 
 namespace SourceGit.Views
 {
@@ -7,6 +9,8 @@ namespace SourceGit.Views
         public Push()
         {
             InitializeComponent();
+            TextSearch.SetTextBinding(LocalBranchesComboBox, new Binding("Name"));
+            TextSearch.SetTextBinding(RemoteBranchesComboBox, new Binding("Name"));
         }
     }
 }
diff --git a/src/Views/SetUpstream.axaml b/src/Views/SetUpstream.axaml
index 6f7d5d71..a2318d0b 100644
--- a/src/Views/SetUpstream.axaml
+++ b/src/Views/SetUpstream.axaml
@@ -26,6 +26,7 @@
                  Margin="0,0,8,0"
                  Text="{DynamicResource Text.SetUpstream.Upstream}"/>
       <ComboBox Grid.Row="1" Grid.Column="1"
+                x:Name="RemoteBranchesComboBox"
                 Height="28" Padding="8,0"
                 VerticalAlignment="Center" HorizontalAlignment="Stretch"
                 ItemsSource="{Binding RemoteBranches}"
diff --git a/src/Views/SetUpstream.axaml.cs b/src/Views/SetUpstream.axaml.cs
index e7b7f356..2c766a7c 100644
--- a/src/Views/SetUpstream.axaml.cs
+++ b/src/Views/SetUpstream.axaml.cs
@@ -1,4 +1,6 @@
 using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Data;
 
 namespace SourceGit.Views
 {
@@ -7,6 +9,7 @@ namespace SourceGit.Views
         public SetUpstream()
         {
             InitializeComponent();
+            TextSearch.SetTextBinding(RemoteBranchesComboBox, new Binding("Name"));
         }
     }
 }