dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-05-30 00:24:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

enhance: show source branch/tag/commit in banner while merging request in progress

Browse source
This commit is contained in:
leo 2024-12-10 15:17:54 +08:00
parent e1df5c52f1
commit ef40e4b738
No known key found for this signature in database
7 changed files with 66 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Views/Repository.axaml
View file

@ -583,7 +583,13 @@
</DataTemplate>
<DataTemplate DataType="vm:MergeInProgress">
<TextBlock FontWeight="Bold" Foreground="{DynamicResource Brush.ConflictForeground}" Text="{DynamicResource Text.InProgress.Merge}"/>
<StackPanel Orientation="Horizontal">
<TextBlock FontWeight="Bold" Foreground="{DynamicResource Brush.ConflictForeground}" Text="{DynamicResource Text.InProgress.Merge}"/>
<TextBlock FontWeight="Bold" Margin="4,0,0,0" Foreground="{DynamicResource Brush.ConflictForeground}" Text="{DynamicResource Text.InProgress.Merge.Operating}"/>
<TextBlock FontWeight="Bold" Margin="4,0,0,0" Foreground="{DynamicResource Brush.Accent}" Text="{Binding SourceName}" ToolTip.Tip="{Binding Source}"/>
<TextBlock FontWeight="Bold" Margin="4,0,0,0" Foreground="{DynamicResource Brush.ConflictForeground}" Text="→"/>
<TextBlock FontWeight="Bold" Margin="4,0,0,0" Foreground="{DynamicResource Brush.Accent}" Text="{Binding Current}"/>
</StackPanel>
</DataTemplate>
</ContentControl.DataTemplates>
</ContentControl>