ui: reorder history quick-search controls

Author: tib8

src/Views/Histories.axaml

@@ -24,7 +24,7 @@
     </v:HistoriesLayout.ColumnDefinitions>
 
     <Grid Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="3" RowDefinitions="Auto,*" x:Name="HistoryListArea">
-      <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto,Auto,Auto,Auto" Height="34" Margin="0,0,4,0"
+      <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto,Auto,Auto,100,22" Height="34" Margin="0,0,4,0"
             HorizontalAlignment="Left" MaxWidth="640" Width="{Binding #HistoryListArea.Bounds.Width}">
         <StackPanel Orientation="Horizontal"
                     Height="18"
@@ -67,8 +67,10 @@
             </Button>
           </TextBox.InnerRightContent>
         </TextBox>
-        <v:LoadingIcon Grid.Column="2" Width="14" Height="14" Margin="4,0" IsVisible="{Binding IsQuickSearching}"/>
-        <TextBlock IsVisible="{Binding !IsQuickSearching}" Grid.Column="2" Text="{Binding QuickSearchStatus}" Margin="4,0" VerticalAlignment="Center"/>
+        <ToggleButton Grid.Column="2" Classes="line_path" Width="24" Height="24" Focusable="False"
+                      IsChecked="{Binding IsQuickSearchFilterEnabled, Mode=TwoWay}" ToolTip.Tip="{DynamicResource Text.Histories.QuickSearch.Filter}">
+          <Path Width="14" Height="14" Data="{StaticResource Icons.Filter}"/>
+        </ToggleButton>
         <Button Grid.Column="3" Classes="icon_button" Width="24" Focusable="False" Command="{Binding QuickSearchPrevious}"
                 IsEnabled="{Binding HasQuickSearchMatches}" ToolTip.Tip="{DynamicResource Text.Histories.QuickSearch.Previous}">
           <Path Width="12" Height="12" Data="{StaticResource Icons.Up}"/>
@@ -77,10 +79,9 @@
                 IsEnabled="{Binding HasQuickSearchMatches}" ToolTip.Tip="{DynamicResource Text.Histories.QuickSearch.Next}">
           <Path Width="12" Height="12" Data="{StaticResource Icons.Down}"/>
         </Button>
-        <ToggleButton Grid.Column="5" Classes="line_path" Width="24" Height="24" Focusable="False"
-                      IsChecked="{Binding IsQuickSearchFilterEnabled, Mode=TwoWay}" ToolTip.Tip="{DynamicResource Text.Histories.QuickSearch.Filter}">
-          <Path Width="14" Height="14" Data="{StaticResource Icons.Filter}"/>
-        </ToggleButton>
+        <TextBlock IsVisible="{Binding !IsQuickSearching}" Grid.Column="5" Text="{Binding QuickSearchStatus}" Margin="4,0" VerticalAlignment="Center"
+                     TextTrimming="CharacterEllipsis" ToolTip.Tip="{Binding QuickSearchStatus}"/>
+        <v:LoadingIcon Grid.Column="6" Width="14" Height="14" Margin="4,0" IsVisible="{Binding IsQuickSearching}"/>
       </Grid>
 
       <v:HistoriesCommitList Grid.Row="1" x:Name="CommitListContainer"