1
1
using System ;
2
2
using System . Collections . Generic ;
3
- using System . Linq ;
4
3
using System . IO ;
4
+ using System . Linq ;
5
5
using System . Threading . Tasks ;
6
+
6
7
using Avalonia ;
7
8
using Avalonia . Collections ;
8
9
using Avalonia . Controls ;
12
13
using Avalonia . Media ;
13
14
using Avalonia . Platform . Storage ;
14
15
using Avalonia . VisualTree ;
16
+
15
17
using SourceGit . ViewModels ;
16
18
17
19
namespace SourceGit . Views
@@ -134,7 +136,7 @@ protected override async void OnKeyDown(KeyEventArgs e)
134
136
135
137
await App . CopyTextAsync ( path ) ;
136
138
e . Handled = true ;
137
- }
139
+ }
138
140
}
139
141
else if ( node . Backend is { Type : Models . ObjectType . Blob } file &&
140
142
e . Key == Key . S &&
@@ -300,7 +302,7 @@ protected override async void OnPropertyChanged(AvaloniaPropertyChangedEventArgs
300
302
var selectedNode = _revisionFileRowsListBox ? . SelectedItem as RevisionFileTreeNode ;
301
303
302
304
var expandedObjects = new List < Models . Object > ( ) ;
303
- foreach ( var node in _rows )
305
+ foreach ( var node in Rows )
304
306
{
305
307
if ( node . IsExpanded )
306
308
{
@@ -349,24 +351,24 @@ protected override async void OnPropertyChanged(AvaloniaPropertyChangedEventArgs
349
351
}
350
352
}
351
353
352
- private void RestoreTreeState ( List < Models . Object > expandedObjects , RevisionFileTreeNode selectedNode )
354
+ private async void RestoreTreeState ( List < Models . Object > expandedObjects , RevisionFileTreeNode selectedNode )
353
355
{
354
- for ( int i = 0 ; i < _rows . Count ; i ++ )
356
+ for ( int i = 0 ; i < Rows . Count ; i ++ )
355
357
{
356
- var revisionFileTreeNode = _rows [ i ] ;
358
+ var revisionFileTreeNode = Rows [ i ] ;
357
359
358
360
if ( ! revisionFileTreeNode . IsFolder )
359
361
continue ;
360
362
361
363
if ( expandedObjects . FirstOrDefault ( o => o . SHA == revisionFileTreeNode . Backend . SHA || o . Path == revisionFileTreeNode . Backend . Path ) != null )
362
364
{
363
- ToggleNodeIsExpanded ( revisionFileTreeNode ) ;
365
+ await ToggleNodeIsExpandedAsync ( revisionFileTreeNode ) ;
364
366
}
365
367
}
366
368
367
369
if ( selectedNode != null )
368
370
{
369
- foreach ( var node in _rows )
371
+ foreach ( var node in Rows )
370
372
{
371
373
if ( node . Backend . SHA != selectedNode . Backend . SHA && node . Backend . Path != selectedNode . Backend . Path )
372
374
continue ;
@@ -393,7 +395,7 @@ private void OnTreeNodeContextRequested(object sender, ContextRequestedEventArgs
393
395
_ => CreateRevisionFileContextMenu ( repo , vm , commit , obj ) ,
394
396
} ;
395
397
menu . Open ( grid ) ;
396
- }
398
+ }
397
399
398
400
e . Handled = true ;
399
401
}
@@ -417,9 +419,9 @@ private async void OnRowsSelectionChanged(object sender, SelectionChangedEventAr
417
419
418
420
if ( sender is ListBox { SelectedItem : ViewModels . RevisionFileTreeNode { IsFolder : false } node } )
419
421
await vm . ViewRevisionFileAsync ( node . Backend ) ;
420
- else
422
+ else
421
423
await vm . ViewRevisionFileAsync ( null ) ;
422
- }
424
+ }
423
425
424
426
private async Task < List < ViewModels . RevisionFileTreeNode > > GetChildrenOfTreeNodeAsync ( ViewModels . RevisionFileTreeNode node )
425
427
{
0 commit comments