Skip to content

Commit e8c8ac5

Browse files
committed
fix: hide children behind the preference
1 parent f3c9690 commit e8c8ac5

File tree

4 files changed

+25
-8
lines changed

4 files changed

+25
-8
lines changed

src/Resources/Locales/en_US.axaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -452,6 +452,7 @@
452452
<x:String x:Key="Text.Preference.General.Locale" xml:space="preserve">Language</x:String>
453453
<x:String x:Key="Text.Preference.General.MaxHistoryCommits" xml:space="preserve">History Commits</x:String>
454454
<x:String x:Key="Text.Preference.General.ShowAuthorTime" xml:space="preserve">Show author time intead of commit time in graph</x:String>
455+
<x:String x:Key="Text.Preference.General.ShowChildren" xml:space="preserve">Show children in the comment details</x:String>
455456
<x:String x:Key="Text.Preference.General.SubjectGuideLength" xml:space="preserve">Subject Guide Length</x:String>
456457
<x:String x:Key="Text.Preference.Git" xml:space="preserve">GIT</x:String>
457458
<x:String x:Key="Text.Preference.Git.CRLF" xml:space="preserve">Enable Auto CRLF</x:String>

src/ViewModels/CommitDetail.cs

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -543,13 +543,16 @@ private void Refresh()
543543

544544
_cancelToken = new Commands.Command.CancelToken();
545545

546-
Task.Run(() =>
546+
if (Preference.Instance.ShowChildren)
547547
{
548-
var cmdChildren = new Commands.QueryCommitChildren(_repo.FullPath, _commit.SHA, _repo.Settings.BuildHistoriesFilter()) { Cancel = _cancelToken };
549-
var children = cmdChildren.Result();
550-
if (!cmdChildren.Cancel.Requested)
551-
Dispatcher.UIThread.Post(() => Children.AddRange(children));
552-
});
548+
Task.Run(() =>
549+
{
550+
var cmdChildren = new Commands.QueryCommitChildren(_repo.FullPath, _commit.SHA, _repo.Settings.BuildHistoriesFilter()) { Cancel = _cancelToken };
551+
var children = cmdChildren.Result();
552+
if (!cmdChildren.Cancel.Requested)
553+
Dispatcher.UIThread.Post(() => Children.AddRange(children));
554+
});
555+
}
553556

554557
Task.Run(() =>
555558
{

src/ViewModels/Preference.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,12 @@ public uint StatisticsSampleColor
294294
set => SetProperty(ref _statisticsSampleColor, value);
295295
}
296296

297+
public bool ShowChildren
298+
{
299+
get => _showChildren;
300+
set => SetProperty(ref _showChildren, value);
301+
}
302+
297303
public List<RepositoryNode> RepositoryNodes
298304
{
299305
get;
@@ -617,5 +623,7 @@ private bool RemoveInvalidRepositoriesRecursive(List<RepositoryNode> collection)
617623
private string _externalMergeToolPath = string.Empty;
618624

619625
private uint _statisticsSampleColor = 0xFF00FF00;
626+
627+
private bool _showChildren = false;
620628
}
621629
}

src/Views/Preference.axaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<TabItem.Header>
4646
<TextBlock Classes="tab_header" Text="{DynamicResource Text.Preference.General}"/>
4747
</TabItem.Header>
48-
<Grid Margin="8" RowDefinitions="32,32,32,32,32,32" ColumnDefinitions="Auto,*">
48+
<Grid Margin="8" RowDefinitions="32,32,32,32,32,32,32" ColumnDefinitions="Auto,*">
4949
<TextBlock Grid.Row="0" Grid.Column="0"
5050
Text="{DynamicResource Text.Preference.General.Locale}"
5151
HorizontalAlignment="Right"
@@ -114,6 +114,11 @@
114114
Height="32"
115115
Content="{DynamicResource Text.Preference.General.Check4UpdatesOnStartup}"
116116
IsChecked="{Binding Source={x:Static vm:Preference.Instance}, Path=Check4UpdatesOnStartup, Mode=TwoWay}"/>
117+
118+
<CheckBox Grid.Row="6" Grid.Column="1"
119+
Height="32"
120+
Content="{DynamicResource Text.Preference.General.ShowChildren}"
121+
IsChecked="{Binding Source={x:Static vm:Preference.Instance}, Path=ShowChildren, Mode=TwoWay}"/>
117122
</Grid>
118123
</TabItem>
119124

@@ -188,7 +193,7 @@
188193
</Border>
189194
</NumericUpDown.InnerLeftContent>
190195
</NumericUpDown>
191-
</Grid>
196+
</Grid>
192197

193198
<TextBlock Grid.Row="4" Grid.Column="0"
194199
Text="{DynamicResource Text.Preference.Appearance.ThemeOverrides}"

0 commit comments

Comments
 (0)