dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-06-21 10:25:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

ux: show conflict short format in changes view

Browse source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo 2025-05-30 10:42:02 +08:00
parent e40ca4bbe0
commit 75015d550c
No known key found for this signature in database
5 changed files with 64 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/Views/ChangeCollectionView.axaml
View file

@ -37,7 +37,7 @@
SelectionChanged="OnRowSelectionChanged">
<ListBox.ItemTemplate>
<DataTemplate DataType="vm:ChangeTreeNode">
<Grid ColumnDefinitions="16,Auto,Auto,*"
<Grid ColumnDefinitions="16,Auto,Auto,Auto"
Margin="{Binding Depth, Converter={x:Static c:IntConverters.ToTreeMargin}}"
Background="Transparent"
DoubleTapped="OnRowDoubleTapped"
@ -58,8 +58,16 @@
IsChecked="{Binding IsExpanded}"
IsVisible="{Binding IsFolder}"/>
<v:ChangeStatusIcon Grid.Column="1" Width="14" Height="14" IsUnstagedChange="{Binding #ThisControl.IsUnstagedChange}" Change="{Binding Change}" IsVisible="{Binding !IsFolder}"/>
<TextBlock Grid.Column="2" Classes="primary" Text="{Binding FullPath, Converter={x:Static c:PathConverters.PureFileName}}" Margin="6,0,0,0"/>
<v:ChangeStatusIcon Grid.Column="1"
Width="14" Height="14"
IsUnstagedChange="{Binding #ThisControl.IsUnstagedChange}"
Change="{Binding Change}"
IsVisible="{Binding !IsFolder}"/>
<StackPanel Grid.Column="3" Orientation="Horizontal" Margin="4,0,0,0">
<TextBlock Classes="primary" Text="{Binding ConflictMarker}" Foreground="DarkOrange" FontWeight="Bold" Margin="0,0,4,0" IsVisible="{Binding ShowConflictMarker}"/>
<TextBlock Classes="primary" Text="{Binding FullPath, Converter={x:Static c:PathConverters.PureFileName}}"/>
</StackPanel>
</Grid>
</DataTemplate>
</ListBox.ItemTemplate>
@ -84,10 +92,10 @@
IsUnstagedChange="{Binding #ThisControl.IsUnstagedChange}"
Change="{Binding}" />
<TextBlock Grid.Column="1"
Classes="primary"
Text="{Binding Path, Converter={x:Static c:PathConverters.PureFileName}}"
Margin="4,0"/>
<StackPanel Grid.Column="1" Orientation="Horizontal" Margin="4,0">
<TextBlock Classes="primary" Text="{Binding ConflictMarker}" Foreground="DarkOrange" FontWeight="Bold" Margin="0,0,4,0" IsVisible="{Binding IsConflicted}"/>
<TextBlock Classes="primary" Text="{Binding Path, Converter={x:Static c:PathConverters.PureFileName}}"/>
</StackPanel>
<TextBlock Grid.Column="2"
Classes="primary"
@ -117,10 +125,10 @@
IsUnstagedChange="{Binding #ThisControl.IsUnstagedChange}"
Change="{Binding}" />
<TextBlock Grid.Column="1"
Classes="primary"
Text="{Binding Path}"
Margin="4,0"/>
<StackPanel Grid.Column="1" Orientation="Horizontal" Margin="4,0">
<TextBlock Classes="primary" Text="{Binding ConflictMarker}" Foreground="DarkOrange" FontWeight="Bold" Margin="0,0,4,0" IsVisible="{Binding IsConflicted}"/>
<TextBlock Classes="primary" Text="{Binding Path}"/>
</StackPanel>
</Grid>
</DataTemplate>
</ListBox.ItemTemplate>

8
src/Views/Conflict.axaml
View file

@ -105,10 +105,10 @@
</Border.IsVisible>
<Grid Margin="8,0,0,0" RowDefinitions="32,32" ColumnDefinitions="Auto,*">
<TextBlock Grid.Row="0" Grid.Column="0" Classes="info_label" Text="THEIRS"/>
<ContentControl Grid.Row="0" Grid.Column="1" Margin="16,0,0,0" Content="{Binding Theirs}"/>
<TextBlock Grid.Row="1" Grid.Column="0" Classes="info_label" Text="MINE"/>
<ContentControl Grid.Row="1" Grid.Column="1" Margin="16,0,0,0" Content="{Binding Mine}"/>
<TextBlock Grid.Row="0" Grid.Column="0" Classes="info_label" Text="MINE"/>
<ContentControl Grid.Row="0" Grid.Column="1" Margin="16,0,0,0" Content="{Binding Mine}"/>
<TextBlock Grid.Row="1" Grid.Column="0" Classes="info_label" Text="THEIRS"/>
<ContentControl Grid.Row="1" Grid.Column="1" Margin="16,0,0,0" Content="{Binding Theirs}"/>
</Grid>
</Border>