|
123 | 123 | <Button Width="0" Height="0" Click="FetchDirectlyByHotKey" IsVisible="False" HotKey="{OnPlatform Ctrl+Down, macOS=⌘+Down}"/> |
124 | 124 | </StackPanel> |
125 | 125 |
|
126 | | - <StackPanel Grid.Column="3" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,0,4,0"> |
127 | | - <Path Width="13" Height="13" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Branch}"/> |
| 126 | + <Grid Grid.Column="3" HorizontalAlignment="Right" ColumnDefinitions="Auto,*,Auto,32"> |
| 127 | + <Path Grid.Column="0" |
| 128 | + Width="13" Height="13" |
| 129 | + Margin="18,0,0,0" |
| 130 | + Data="{StaticResource Icons.Branch}"/> |
128 | 131 |
|
129 | | - <ContentControl Margin="6,0,0,0"> |
| 132 | + <ContentControl Grid.Column="1" Margin="6,0,0,0"> |
130 | 133 | <ContentControl.Content> |
131 | 134 | <Binding Path="CurrentBranch"> |
132 | 135 | <Binding.TargetNullValue> |
|
138 | 141 | <ContentControl.DataTemplates> |
139 | 142 | <DataTemplate DataType="m:Branch"> |
140 | 143 | <Border Background="Transparent" ToolTip.Tip="{Binding FriendlyName}"> |
141 | | - <TextBlock Text="{Binding FriendlyName}" MaxWidth="250" TextTrimming="CharacterEllipsis"/> |
| 144 | + <TextBlock Text="{Binding FriendlyName}" TextTrimming="CharacterEllipsis"/> |
142 | 145 | </Border> |
143 | 146 | </DataTemplate> |
144 | 147 | </ContentControl.DataTemplates> |
145 | 148 | </ContentControl> |
146 | 149 |
|
147 | | - <Button Classes="icon_button" Width="32" Click="NavigateToHead" ToolTip.Tip="{DynamicResource Text.Repository.NavigateToCurrentHead}"> |
148 | | - <Path Width="13" Height="13" Margin="0,2,0,0" Data="{StaticResource Icons.Target}" Fill="{DynamicResource Brush.FG1}"/> |
| 150 | + <Border Grid.Column="2" |
| 151 | + Margin="4,0,0,0" |
| 152 | + Height="18" |
| 153 | + Padding="6,0" |
| 154 | + CornerRadius="9" |
| 155 | + Background="{DynamicResource Brush.Badge}" |
| 156 | + VerticalAlignment="Center" |
| 157 | + IsVisible="{Binding CurrentBranch?.IsTrackStatusVisible, TargetNullValue=False, Mode=OneWay}"> |
| 158 | + <TextBlock Text="{Binding CurrentBranch?.TrackStatusDescription, Mode=OneWay}" |
| 159 | + FontFamily="{DynamicResource Fonts.Monospace}" |
| 160 | + FontSize="11" |
| 161 | + Foreground="{DynamicResource Brush.BadgeFG}"/> |
| 162 | + </Border> |
| 163 | + |
| 164 | + <Button Grid.Column="3" |
| 165 | + Classes="icon_button" |
| 166 | + Width="32" |
| 167 | + Click="NavigateToHead" |
| 168 | + ToolTip.Tip="{DynamicResource Text.Repository.NavigateToCurrentHead}"> |
| 169 | + <Path Width="13" Height="13" |
| 170 | + Margin="0,2,0,0" |
| 171 | + Data="{StaticResource Icons.Target}"/> |
149 | 172 | </Button> |
150 | | - </StackPanel> |
| 173 | + </Grid> |
151 | 174 | </Grid> |
152 | 175 | </UserControl> |
0 commit comments