mirror of
https://github.com/sourcegit-scm/sourcegit
synced 2025-05-29 16:14:59 +00:00
feature: add an indicator that shows those commits the current branch ahead/behind its upstream
This commit is contained in:
parent
9de2853003
commit
f0649c95b5
12 changed files with 180 additions and 194 deletions
|
@ -88,8 +88,13 @@
|
|||
CornerRadius="9"
|
||||
VerticalAlignment="Center"
|
||||
Background="{DynamicResource Brush.Badge}"
|
||||
IsVisible="{Binding IsUpstreamTrackStatusVisible}">
|
||||
<TextBlock Classes="monospace" FontSize="10" HorizontalAlignment="Center" Margin="9,0" Text="{Binding UpstreamTrackStatus}" Foreground="{DynamicResource Brush.BadgeFG}"/>
|
||||
IsVisible="{Binding TrackStatus, Converter={x:Static StringConverters.IsNotNullOrEmpty}}">
|
||||
<TextBlock Classes="monospace"
|
||||
FontSize="10"
|
||||
HorizontalAlignment="Center"
|
||||
Margin="9,0"
|
||||
Text="{Binding TrackStatus}"
|
||||
Foreground="{DynamicResource Brush.BadgeFG}"/>
|
||||
</Border>
|
||||
|
||||
<!-- Filter Toggle Button -->
|
||||
|
|
|
@ -100,6 +100,16 @@
|
|||
</DataTemplate>
|
||||
</ItemsControl.ItemTemplate>
|
||||
</ItemsControl>
|
||||
|
||||
<Ellipse Width="5" Height="5"
|
||||
Margin="0,0,4,0"
|
||||
Fill="{DynamicResource Brush.Accent}"
|
||||
IsVisible="{Binding CanPushToUpstream}"/>
|
||||
|
||||
<Ellipse Width="5" Height="5"
|
||||
Margin="0,0,4,0"
|
||||
Fill="{DynamicResource Brush.FG1}"
|
||||
IsVisible="{Binding CanPullFromUpstream}"/>
|
||||
|
||||
<TextBlock Classes="monospace"
|
||||
Text="{Binding Subject}"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue