Skip to content

Commit 35eda48

Browse files
committed
feature: show local branch's track status in CheckoutAndFastForward popup
Signed-off-by: leo <[email protected]>
1 parent f59851f commit 35eda48

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

src/Views/CheckoutAndFastForward.axaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,18 @@
2727
<StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal">
2828
<Path Width="14" Height="14" Margin="4,0" Data="{StaticResource Icons.Branch}"/>
2929
<TextBlock Text="{Binding LocalBranch.Name}"/>
30+
<Border Height="18"
31+
Margin="8,0,0,0"
32+
Padding="8,0"
33+
VerticalAlignment="Center"
34+
CornerRadius="9"
35+
Background="{DynamicResource Brush.Badge}"
36+
IsVisible="{Binding LocalBranch.TrackStatus.IsVisible}">
37+
<TextBlock Foreground="{DynamicResource Brush.BadgeFG}"
38+
FontFamily="{DynamicResource Fonts.Monospace}"
39+
FontSize="10"
40+
Text="{Binding LocalBranch.TrackStatus}"/>
41+
</Border>
3042
</StackPanel>
3143

3244
<TextBlock Grid.Row="1" Grid.Column="0"

0 commit comments

Comments
 (0)