@@ -350,7 +350,6 @@ class HistoryView : Subview
350
350
[ SerializeField ] private int statusAhead ;
351
351
[ SerializeField ] private int statusBehind ;
352
352
353
- [ SerializeField ] private Vector2 treeScroll ;
354
353
[ SerializeField ] private ChangesTree treeChanges ;
355
354
356
355
[ SerializeField ] private CacheUpdateEvent lastCurrentRemoteChangedEvent ;
@@ -493,32 +492,28 @@ public override void OnGUI()
493
492
rect = GUILayoutUtility . GetLastRect ( ) ;
494
493
GUILayout . BeginHorizontal ( Styles . HistoryFileTreeBoxStyle ) ;
495
494
{
496
- treeScroll = GUILayout . BeginScrollView ( treeScroll ) ;
495
+ var treeControlRect = new Rect ( 0f , 0f , Position . width , Position . height - rect . height + Styles . CommitAreaPadding ) ;
496
+ var treeRect = Rect . zero ;
497
+ if ( treeChanges != null )
497
498
{
498
- var treeControlRect = new Rect ( 0f , 0f , Position . width , Position . height - rect . height + Styles . CommitAreaPadding ) ;
499
- var treeRect = Rect . zero ;
500
- if ( treeChanges != null )
501
- {
502
- treeChanges . FolderStyle = Styles . Foldout ;
503
- treeChanges . TreeNodeStyle = Styles . TreeNode ;
504
- treeChanges . ActiveTreeNodeStyle = Styles . ActiveTreeNode ;
505
- treeChanges . FocusedTreeNodeStyle = Styles . FocusedTreeNode ;
506
- treeChanges . FocusedActiveTreeNodeStyle = Styles . FocusedActiveTreeNode ;
507
-
508
- treeRect = treeChanges . Render ( treeControlRect , treeControlRect , treeScroll ,
509
- node => { } ,
510
- node => {
511
- } ,
512
- node => {
513
- } ) ;
514
-
515
- if ( treeChanges . RequiresRepaint )
516
- Redraw ( ) ;
517
- }
518
-
519
- GUILayout . Space ( treeRect . y - treeControlRect . y ) ;
499
+ treeChanges . FolderStyle = Styles . Foldout ;
500
+ treeChanges . TreeNodeStyle = Styles . TreeNode ;
501
+ treeChanges . ActiveTreeNodeStyle = Styles . ActiveTreeNode ;
502
+ treeChanges . FocusedTreeNodeStyle = Styles . FocusedTreeNode ;
503
+ treeChanges . FocusedActiveTreeNodeStyle = Styles . FocusedActiveTreeNode ;
504
+
505
+ treeRect = treeChanges . Render ( treeControlRect , treeControlRect , detailsScroll ,
506
+ node => { } ,
507
+ node => {
508
+ } ,
509
+ node => {
510
+ } ) ;
511
+
512
+ if ( treeChanges . RequiresRepaint )
513
+ Redraw ( ) ;
520
514
}
521
- GUILayout . EndScrollView ( ) ;
515
+
516
+ GUILayout . Space ( treeRect . y - treeControlRect . y ) ;
522
517
}
523
518
GUILayout . EndHorizontal ( ) ;
524
519
0 commit comments