Skip to content

Commit d628871

Browse files
committed
ux: add a check mark to indicate which side is HEAD in Compare window
Signed-off-by: leo <longshuang@msn.cn>
1 parent 2271adc commit d628871

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

src/Views/Compare.axaml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,10 @@
4848
User="{Binding BaseHead.Author}"/>
4949
<TextBlock Grid.Column="1" Text="{Binding BaseHead.Author.Name}" Margin="8,0,0,0"/>
5050
<Border Grid.Column="2" Background="{DynamicResource Brush.Accent}" CornerRadius="4">
51-
<TextBlock Text="{Binding BaseName}" Margin="4,0" Foreground="#FFDDDDDD"/>
51+
<StackPanel Orientation="Horizontal">
52+
<Path Width="12" Height="12" Margin="4,2,0,0" Data="{StaticResource Icons.Check}" Fill="White" IsVisible="{Binding BaseHead.IsCurrentHead, Mode=OneWay}"/>
53+
<TextBlock Text="{Binding BaseName}" Margin="4,0" Foreground="#FFDDDDDD"/>
54+
</StackPanel>
5255
</Border>
5356
<TextBlock Grid.Column="3" Text="{Binding BaseHead.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0" TextDecorations="Underline" Cursor="Hand" PointerPressed="OnPressedSHA"/>
5457
<TextBlock Grid.Column="4" Text="{Binding BaseHead.CommitterTimeStr}" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/>
@@ -72,7 +75,10 @@
7275
User="{Binding ToHead.Author}"/>
7376
<TextBlock Grid.Column="1" Text="{Binding ToHead.Author.Name}" Margin="8,0,0,0"/>
7477
<Border Grid.Column="2" Background="{DynamicResource Brush.Accent}" CornerRadius="4">
75-
<TextBlock Text="{Binding ToName}" Margin="4,0" Foreground="#FFDDDDDD"/>
78+
<StackPanel Orientation="Horizontal">
79+
<Path Width="12" Height="12" Margin="4,2,0,0" Data="{StaticResource Icons.Check}" Fill="White" IsVisible="{Binding ToHead.IsCurrentHead, Mode=OneWay}"/>
80+
<TextBlock Text="{Binding ToName}" Margin="4,0" Foreground="#FFDDDDDD"/>
81+
</StackPanel>
7682
</Border>
7783
<TextBlock Grid.Column="3" Text="{Binding ToHead.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0" TextDecorations="Underline" Cursor="Hand" PointerPressed="OnPressedSHA"/>
7884
<TextBlock Grid.Column="4" Text="{Binding ToHead.CommitterTimeStr}" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/>

0 commit comments

Comments
 (0)