ux: use BranchSelector instead of ComboBox to select local branch in Push pop

Signed-off-by: leo <longshuang@msn.cn>

Author: love-linger

src/Views/ExecuteCustomAction.axaml

@@ -149,7 +149,7 @@
                        HorizontalAlignment="Right" VerticalAlignment="Center"
                        Margin="0,0,8,0"/>
             <v:BranchSelector Grid.Row="0" Grid.Column="1"
-                              Height="28" Padding="8,0"
+                              Height="28"
                               VerticalAlignment="Center" HorizontalAlignment="Stretch"
                               Branches="{Binding Branches, Mode=OneWay}"
                               SelectedBranch="{Binding SelectedBranch, Mode=TwoWay}"/>

src/Views/Pull.axaml

@@ -45,7 +45,7 @@
                  Margin="0,0,8,0"
                  Text="{DynamicResource Text.Pull.Branch}"/>
       <v:BranchSelector Grid.Row="1" Grid.Column="1"
-                        Height="28" Padding="8,0"
+                        Height="28"
                         VerticalAlignment="Center" HorizontalAlignment="Stretch"
                         Branches="{Binding RemoteBranches, Mode=OneWay}"
                         SelectedBranch="{Binding SelectedBranch, Mode=TwoWay}"

src/Views/Push.axaml

@@ -24,23 +24,12 @@
                  HorizontalAlignment="Right" VerticalAlignment="Center"
                  Margin="0,0,8,0"
                  Text="{DynamicResource Text.Push.Local}"/>
-      <ComboBox Grid.Row="0" Grid.Column="1"
-                Height="28" Padding="8,0"
-                VerticalAlignment="Center" HorizontalAlignment="Stretch"
-                ItemsSource="{Binding LocalBranches}"
-                SelectedItem="{Binding SelectedLocalBranch, Mode=TwoWay}"
-                IsTextSearchEnabled="True"
-                TextSearch.TextBinding="{Binding Name, DataType=m:Branch}"
-                IsEnabled="{Binding !HasSpecifiedLocalBranch}">
-        <ComboBox.ItemTemplate>
-          <DataTemplate x:DataType="{x:Type m:Branch}">
-            <StackPanel Orientation="Horizontal" Height="20" VerticalAlignment="Center">
-              <Path Margin="0,0,8,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Branch}"/>
-              <TextBlock Text="{Binding Name}"/>
-            </StackPanel>
-          </DataTemplate>
-        </ComboBox.ItemTemplate>
-      </ComboBox>
+      <v:BranchSelector Grid.Row="0" Grid.Column="1"
+                        Height="28"
+                        VerticalAlignment="Center" HorizontalAlignment="Stretch"
+                        Branches="{Binding LocalBranches}"
+                        SelectedBranch="{Binding SelectedLocalBranch, Mode=TwoWay}"
+                        IsEnabled="{Binding !HasSpecifiedLocalBranch}"/>
 
       <TextBlock Grid.Row="1" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
@@ -67,7 +56,7 @@
                  Text="{DynamicResource Text.Push.To}"/>
       <Grid Grid.Row="2" Grid.Column="1" ColumnDefinitions="*,Auto">
         <v:BranchSelector Grid.Column="0"
-                          Height="28" Padding="8,0"
+                          Height="28"
                           VerticalAlignment="Center" HorizontalAlignment="Stretch"
                           Branches="{Binding RemoteBranches, Mode=OneWay}"
                           SelectedBranch="{Binding SelectedRemoteBranch, Mode=TwoWay}"