Skip to content

Commit d6d69f6

Browse files
committed
ux: show warning icon in collapsed sidebar when we need to resolve conflicts
Signed-off-by: leo <longshuang@msn.cn>
1 parent a8338d0 commit d6d69f6

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

src/Views/Repository.axaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -739,6 +739,12 @@
739739
FontFamily="{DynamicResource Fonts.Monospace}"
740740
FontSize="10"/>
741741
</Border>
742+
<Path Width="12" Height="12"
743+
Margin="0,0,4,4"
744+
HorizontalAlignment="Right" VerticalAlignment="Bottom"
745+
Data="{StaticResource Icons.Info}"
746+
Fill="DarkOrange"
747+
IsVisible="{Binding InProgressContext, Converter={x:Static ObjectConverters.IsNotNull}}"/>
742748
</Grid>
743749
</ListBoxItem>
744750

0 commit comments

Comments
 (0)