ux: hide the row to deal with uncommitted local changes when there are no local changes

love-linger · love-linger · commit 5f520932a2c2 · 2026-03-23T14:26:42.000+08:00
Signed-off-by: leo &lt;longshuang@msn.cn&gt;
diff --git a/src/ViewModels/Checkout.cs b/src/ViewModels/Checkout.cs
@@ -9,6 +9,11 @@ public string BranchName
             get => _branch.Name;
         }
 
+        public bool HasLocalChanges
+        {
+            get => _repo.LocalChangesCount > 0;
+        }
+
         public Models.DealWithLocalChanges DealWithLocalChanges
         {
             get;
diff --git a/src/ViewModels/CheckoutAndFastForward.cs b/src/ViewModels/CheckoutAndFastForward.cs
@@ -14,6 +14,11 @@ public Models.Branch RemoteBranch
             get;
         }
 
+        public bool HasLocalChanges
+        {
+            get => _repo.LocalChangesCount > 0;
+        }
+
         public Models.DealWithLocalChanges DealWithLocalChanges
         {
             get;
diff --git a/src/ViewModels/CheckoutCommit.cs b/src/ViewModels/CheckoutCommit.cs
@@ -9,6 +9,11 @@ public Models.Commit Commit
             get;
         }
 
+        public bool HasLocalChanges
+        {
+            get => _repo.LocalChangesCount > 0;
+        }
+
         public Models.DealWithLocalChanges DealWithLocalChanges
         {
             get;
diff --git a/src/ViewModels/Pull.cs b/src/ViewModels/Pull.cs
@@ -38,6 +38,11 @@ public Models.Branch SelectedBranch
             set => SetProperty(ref _selectedBranch, value, true);
         }
 
+        public bool HasLocalChanges
+        {
+            get => _repo.LocalChangesCount > 0;
+        }
+
         public Models.DealWithLocalChanges DealWithLocalChanges
         {
             get;
diff --git a/src/Views/Checkout.axaml b/src/Views/Checkout.axaml
@@ -19,12 +19,7 @@
                  Text="{DynamicResource Text.Checkout}"/>
     </StackPanel>
 
-    <Grid Margin="0,16,0,0" ColumnDefinitions="140,*">
-      <Grid.RowDefinitions>
-        <RowDefinition Height="32"/>
-        <RowDefinition Height="Auto" MinHeight="32"/>
-      </Grid.RowDefinitions>
-
+    <Grid Margin="0,16,0,0" RowDefinitions="32,Auto" ColumnDefinitions="140,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
                  Margin="0,0,8,0"
@@ -36,13 +31,15 @@
 
       <Border Grid.Row="1" Grid.Column="0"
               Height="32"
-              VerticalAlignment="Top">
+              VerticalAlignment="Top"
+              IsVisible="{Binding HasLocalChanges, Mode=OneWay}">
         <TextBlock HorizontalAlignment="Right" VerticalAlignment="Center"
                    Margin="0,0,8,0"
                    Text="{DynamicResource Text.Checkout.LocalChanges}"/>
       </Border>
       <v:DealWithLocalChangesMethod Grid.Row="1" Grid.Column="1"
-                                    Method="{Binding DealWithLocalChanges, Mode=TwoWay}"/>
+                                    Method="{Binding DealWithLocalChanges, Mode=TwoWay}"
+                                    IsVisible="{Binding HasLocalChanges, Mode=OneWay}"/>
     </Grid>
   </StackPanel>
 </UserControl>
diff --git a/src/Views/CheckoutAndFastForward.axaml b/src/Views/CheckoutAndFastForward.axaml
@@ -19,13 +19,7 @@
                  Text="{DynamicResource Text.Checkout.WithFastForward}"/>
     </StackPanel>
 
-    <Grid Margin="0,16,0,0" ColumnDefinitions="140,*">
-      <Grid.RowDefinitions>
-        <RowDefinition Height="32"/>
-        <RowDefinition Height="32"/>
-        <RowDefinition Height="Auto" MinHeight="32"/>
-      </Grid.RowDefinitions>
-
+    <Grid Margin="0,16,0,0" RowDefinitions="32,32,Auto" ColumnDefinitions="140,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
                  Margin="0,0,8,0"
@@ -58,13 +52,15 @@
 
       <Border Grid.Row="2" Grid.Column="0"
               Height="32"
-              VerticalAlignment="Top">
+              VerticalAlignment="Top"
+              IsVisible="{Binding HasLocalChanges, Mode=OneWay}">
         <TextBlock HorizontalAlignment="Right" VerticalAlignment="Center"
                    Margin="0,0,8,0"
                    Text="{DynamicResource Text.Checkout.LocalChanges}"/>
       </Border>
       <v:DealWithLocalChangesMethod Grid.Row="2" Grid.Column="1"
-                                    Method="{Binding DealWithLocalChanges, Mode=TwoWay}"/>
+                                    Method="{Binding DealWithLocalChanges, Mode=TwoWay}"
+                                    IsVisible="{Binding HasLocalChanges, Mode=OneWay}"/>
     </Grid>
   </StackPanel>
 </UserControl>
diff --git a/src/Views/CheckoutCommit.axaml b/src/Views/CheckoutCommit.axaml
@@ -19,12 +19,7 @@
                  Text="{DynamicResource Text.Checkout.Commit}"/>
     </StackPanel>
 
-    <Grid Margin="0,16,0,0">
-      <Grid.RowDefinitions>
-        <RowDefinition Height="32"/>
-        <RowDefinition Height="Auto" MinHeight="32"/>
-        <RowDefinition Height="Auto"/>
-      </Grid.RowDefinitions>
+    <Grid Margin="0,16,0,0" RowDefinitions="32,Auto,Auto">
       <Grid.ColumnDefinitions>
         <ColumnDefinition Width="Auto" MinWidth="140"/>
         <ColumnDefinition Width="*"/>
@@ -42,13 +37,15 @@
 
       <Border Grid.Row="1" Grid.Column="0"
               Height="32"
-              VerticalAlignment="Top">
+              VerticalAlignment="Top"
+              IsVisible="{Binding HasLocalChanges, Mode=OneWay}">
         <TextBlock HorizontalAlignment="Right" VerticalAlignment="Center"
                    Margin="0,0,8,0"
                    Text="{DynamicResource Text.Checkout.LocalChanges}"/>
       </Border>
       <v:DealWithLocalChangesMethod Grid.Row="1" Grid.Column="1"
-                                    Method="{Binding DealWithLocalChanges, Mode=TwoWay}"/>
+                                    Method="{Binding DealWithLocalChanges, Mode=TwoWay}"
+                                    IsVisible="{Binding HasLocalChanges, Mode=OneWay}"/>
 
       <Grid Grid.Row="2" Grid.Column="1" ColumnDefinitions="Auto,*" Margin="0,6,0,0">
         <Path Grid.Column="0"
diff --git a/src/Views/Pull.axaml b/src/Views/Pull.axaml
@@ -19,15 +19,7 @@
                  Text="{DynamicResource Text.Pull.Title}"/>
     </StackPanel>
     
-    <Grid Margin="0,16,0,0" ColumnDefinitions="140,*">
-      <Grid.RowDefinitions>
-        <RowDefinition Height="32"/>
-        <RowDefinition Height="32"/>
-        <RowDefinition Height="32"/>
-        <RowDefinition Height="Auto" MinHeight="32"/>
-        <RowDefinition Height="32"/>
-      </Grid.RowDefinitions>
-
+    <Grid Margin="0,16,0,0" RowDefinitions="32,32,32,Auto,32" ColumnDefinitions="140,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
                  Margin="0,0,8,0"
@@ -81,13 +73,15 @@
 
       <Border Grid.Row="3" Grid.Column="0"
               Height="32"
-              VerticalAlignment="Top">
+              VerticalAlignment="Top"
+              IsVisible="{Binding HasLocalChanges, Mode=OneWay}">
         <TextBlock HorizontalAlignment="Right" VerticalAlignment="Center"
                    Margin="0,0,8,0"
                    Text="{DynamicResource Text.Pull.LocalChanges}"/>
       </Border>
       <v:DealWithLocalChangesMethod Grid.Row="3" Grid.Column="1"
-                                    Method="{Binding DealWithLocalChanges, Mode=TwoWay}"/>
+                                    Method="{Binding DealWithLocalChanges, Mode=TwoWay}"
+                                    IsVisible="{Binding HasLocalChanges, Mode=OneWay}"/>
 
       <CheckBox Grid.Row="4" Grid.Column="1"
                 Content="{DynamicResource Text.Pull.UseRebase}"

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,11 @@ public string BranchName`
`9`	`9`	`get => _branch.Name;`
`10`	`10`	`}`
`11`	`11`
	`12`	`+ public bool HasLocalChanges`
	`13`	`+ {`
	`14`	`+ get => _repo.LocalChangesCount > 0;`
	`15`	`+ }`
	`16`	`+`
`12`	`17`	`public Models.DealWithLocalChanges DealWithLocalChanges`
`13`	`18`	`{`
`14`	`19`	`get;`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,11 @@ public Models.Branch RemoteBranch`
`14`	`14`	`get;`
`15`	`15`	`}`
`16`	`16`
	`17`	`+ public bool HasLocalChanges`
	`18`	`+ {`
	`19`	`+ get => _repo.LocalChangesCount > 0;`
	`20`	`+ }`
	`21`	`+`
`17`	`22`	`public Models.DealWithLocalChanges DealWithLocalChanges`
`18`	`23`	`{`
`19`	`24`	`get;`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,11 @@ public Models.Commit Commit`
`9`	`9`	`get;`
`10`	`10`	`}`
`11`	`11`
	`12`	`+ public bool HasLocalChanges`
	`13`	`+ {`
	`14`	`+ get => _repo.LocalChangesCount > 0;`
	`15`	`+ }`
	`16`	`+`
`12`	`17`	`public Models.DealWithLocalChanges DealWithLocalChanges`
`13`	`18`	`{`
`14`	`19`	`get;`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,11 @@ public Models.Branch SelectedBranch`
`38`	`38`	`set => SetProperty(ref _selectedBranch, value, true);`
`39`	`39`	`}`
`40`	`40`
	`41`	`+ public bool HasLocalChanges`
	`42`	`+ {`
	`43`	`+ get => _repo.LocalChangesCount > 0;`
	`44`	`+ }`
	`45`	`+`
`41`	`46`	`public Models.DealWithLocalChanges DealWithLocalChanges`
`42`	`47`	`{`
`43`	`48`	`get;`