Skip to content

Commit 2d7ea56

Browse files
yindfyindf
authored andcommitted
fix bug that stuck auto fetch when pull failed & make stage area resizeable (#627)
* fix watcher stuck by pull * make stage area resizeable --------- Co-authored-by: yindf <[email protected]> (cherry picked from commit a842aca)
1 parent fe03512 commit 2d7ea56

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

src/ViewModels/Pull.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,10 @@ public override Task<bool> Sure()
149149
SetProgressDescription($"Fetching remote: {_selectedRemote.Name}...");
150150
rs = new Commands.Fetch(_repo.FullPath, _selectedRemote.Name, NoTags, SetProgressDescription).Exec();
151151
if (!rs)
152+
{
153+
CallUIThread(() => _repo.SetWatcherEnabled(true));
152154
return false;
155+
}
153156

154157
_repo.MarkFetched();
155158

src/Views/WorkingCopy.axaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,15 @@
8080
ChangeDoubleTapped="OnUnstagedChangeDoubleTapped"
8181
KeyDown="OnUnstagedKeyDown"/>
8282

83+
84+
<!-- Splitter -->
85+
<GridSplitter Grid.Row="2"
86+
MinWidth="1"
87+
HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
88+
Background="Transparent"
89+
BorderThickness="0,0,1,0"
90+
BorderBrush="{DynamicResource Brush.Border0}"/>
91+
8392
<!-- Staged Toolbar -->
8493
<Border Grid.Row="2" BorderThickness="0,1" BorderBrush="{DynamicResource Brush.Border0}">
8594
<Grid ColumnDefinitions="Auto,Auto,Auto,Auto,*,Auto,Auto,Auto">

0 commit comments

Comments
 (0)