From 814af539cd875b28cdd63d9c37cf515cd8583290 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 1 Apr 2024 19:59:15 +0800
Subject: [PATCH] fix: resolve button should be visible when current active
 view index is NOT 1 (the changes page)

---
 src/SourceGit/Converters/IntConverters.cs | 3 +++
 src/SourceGit/Views/Repository.axaml      | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/SourceGit/Converters/IntConverters.cs b/src/SourceGit/Converters/IntConverters.cs
index f89dab9b..820f62c5 100644
--- a/src/SourceGit/Converters/IntConverters.cs
+++ b/src/SourceGit/Converters/IntConverters.cs
@@ -12,5 +12,8 @@ namespace SourceGit.Converters
 
         public static readonly FuncValueConverter<int, bool> IsOne =
             new FuncValueConverter<int, bool>(v => v == 1);
+
+        public static readonly FuncValueConverter<int, bool> IsNotOne =
+            new FuncValueConverter<int, bool>(v => v != 1);
     }
 }
diff --git a/src/SourceGit/Views/Repository.axaml b/src/SourceGit/Views/Repository.axaml
index 3cf1fea3..0bd58201 100644
--- a/src/SourceGit/Views/Repository.axaml
+++ b/src/SourceGit/Views/Repository.axaml
@@ -468,7 +468,7 @@
           <TextBlock Grid.Column="0" Margin="8,0" FontWeight="Bold" Foreground="{DynamicResource Brush.FG3}" Text="{DynamicResource Text.Conflict.Tip}"/>
           <Button Grid.Column="1" Classes="flat" FontWeight="Regular" Content="{DynamicResource Text.Repository.Resolve}" Height="20" Padding="8,0" Margin="4,0" Command="{Binding GotoResolve}">
             <Button.IsVisible>
-              <Binding Path="SelectedViewIndex" Converter="{x:Static c:IntConverters.IsOne}"/>
+              <Binding Path="SelectedViewIndex" Converter="{x:Static c:IntConverters.IsNotOne}"/>
             </Button.IsVisible>
           </Button>
           <Button Grid.Column="2" Classes="flat primary" FontWeight="Regular" Content="{DynamicResource Text.Repository.Continue}" Height="20" Padding="8,0" Margin="4,0" Command="{Binding ContinueMerge}" IsVisible="{Binding !HasUnsolvedConflict}"/>