Skip to content
This repository was archived by the owner on Dec 5, 2024. It is now read-only.

Commit 5c5074a

Browse files
Realizing the extra scrollView
1 parent ff03fe2 commit 5c5074a

File tree

1 file changed

+20
-25
lines changed

1 file changed

+20
-25
lines changed

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs

Lines changed: 20 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,6 @@ class HistoryView : Subview
350350
[SerializeField] private int statusAhead;
351351
[SerializeField] private int statusBehind;
352352

353-
[SerializeField] private Vector2 treeScroll;
354353
[SerializeField] private ChangesTree treeChanges;
355354

356355
[SerializeField] private CacheUpdateEvent lastCurrentRemoteChangedEvent;
@@ -493,32 +492,28 @@ public override void OnGUI()
493492
rect = GUILayoutUtility.GetLastRect();
494493
GUILayout.BeginHorizontal(Styles.HistoryFileTreeBoxStyle);
495494
{
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)
497498
{
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();
520514
}
521-
GUILayout.EndScrollView();
515+
516+
GUILayout.Space(treeRect.y - treeControlRect.y);
522517
}
523518
GUILayout.EndHorizontal();
524519

0 commit comments

Comments
 (0)