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

feature<DiffViewer>: supports to diff with external merge tools

Browse source
This commit is contained in:
leo 2021-05-31 10:25:48 +08:00
parent 8993f50944
commit 259473626b
6 changed files with 50 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/Views/Widgets/DiffViewer.xaml
View file

@ -58,12 +58,19 @@
<ToggleButton
Width="14" Height="14"
Margin="4,0,0,0"
Margin="4,0"
Style="{StaticResource Style.ToggleButton.SplitDirection}"
Foreground="{StaticResource Brush.FG1}"
ToolTip="{StaticResource Text.Diff.Mode}"
IsChecked="{Binding Source={x:Static models:Preference.Instance}, Path=Window.UseCombinedDiff, Mode=TwoWay}"
Checked="OnDiffViewModeChanged" Unchecked="OnDiffViewModeChanged"/>
<controls:IconButton
Width="14" Height="14"
Margin="4,0,0,0"
Icon="{StaticResource Icon.DiffWith}"
ToolTip="{StaticResource Text.Diff.UseMerger}"
Click="OpenWithMerger"/>
</StackPanel>
</Grid>
</Border>