From eea3d2c6c035715e8e9d3cc173bb2ecdf21a924c Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 3 Apr 2024 09:42:55 +0800
Subject: [PATCH] feature: enable to use external merge tool for all type of
 files (#53)

---
 src/Views/DiffView.axaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Views/DiffView.axaml b/src/Views/DiffView.axaml
index 2a39e53c..04fff7a9 100644
--- a/src/Views/DiffView.axaml
+++ b/src/Views/DiffView.axaml
@@ -26,12 +26,13 @@
             <Path Classes="rotating" Width="10" Height="10" Margin="8,0" Data="{DynamicResource Icons.Loading}" IsVisible="{Binding IsLoading}"/>
           </StackPanel>
 
-          <StackPanel Grid.Column="2" Margin="32,0,0,0" Orientation="Horizontal" IsVisible="{Binding IsTextDiff}" VerticalAlignment="Center">
+          <StackPanel Grid.Column="2" Margin="32,0,0,0" Orientation="Horizontal" VerticalAlignment="Center">
             <ToggleButton Classes="line_path"
                           Width="32" Height="18"
                           Background="Transparent"
                           Padding="9,6"
                           IsChecked="{Binding Source={x:Static vm:Preference.Instance}, Path=UseSyntaxHighlighting, Mode=TwoWay}"
+                          IsVisible="{Binding IsTextDiff}" 
                           ToolTip.Tip="{DynamicResource Text.Diff.SyntaxHighlight}">
               <Path Width="13" Height="13" Data="{StaticResource Icons.SyntaxHighlight}" Margin="0,3,0,0"/>
             </ToggleButton>
@@ -41,6 +42,7 @@
                           Background="Transparent"
                           Padding="9,6"
                           IsChecked="{Binding Source={x:Static vm:Preference.Instance}, Path=UseSideBySideDiff, Mode=TwoWay}"
+                          IsVisible="{Binding IsTextDiff}" 
                           ToolTip.Tip="{DynamicResource Text.Diff.SideBySide}">
               <Path Width="12" Height="12" Data="{StaticResource Icons.LayoutHorizontal}" Margin="0,2,0,0"/>
             </ToggleButton>