Merge pull request #520 from github-for-unity/fixes/base-classes-with-serailized-fields

Moving serialized fields down to derived classes for best milage

Author: StanleyGoldman

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

@@ -35,6 +35,56 @@ public class ChangesTree : Tree<ChangesTreeNode, GitStatusEntryTreeData>
         [SerializeField] public ChangesTreeNodeDictionary checkedFileNodes = new ChangesTreeNodeDictionary();
 
         [NonSerialized] public Texture2D FolderIcon;
+        [SerializeField] public string title = string.Empty;
+        [SerializeField] public string pathSeparator = "/";
+        [SerializeField] public bool displayRootNode = true;
+        [SerializeField] public bool isCheckable = false;
+        [SerializeField] private List<ChangesTreeNode> nodes = new List<ChangesTreeNode>();
+        [SerializeField] private ChangesTreeNode selectedNode = null;
+
+        public override string Title
+        {
+            get { return title; }
+            set { title = value; }
+        }
+
+        public override bool DisplayRootNode
+        {
+            get { return displayRootNode; }
+            set { displayRootNode = value; }
+        }
+
+        public override bool IsCheckable
+        {
+            get { return isCheckable; }
+            set { isCheckable = value; }
+        }
+
+        public override string PathSeparator
+        {
+            get { return pathSeparator; }
+            set { pathSeparator = value; }
+        }
+
+        public override ChangesTreeNode SelectedNode
+        {
+            get
+            {
+                if (selectedNode != null && String.IsNullOrEmpty(selectedNode.Path))
+                    selectedNode = null;
+
+                return selectedNode;
+            }
+            set
+            {
+                selectedNode = value;
+            }
+        }
+
+        protected override List<ChangesTreeNode> Nodes
+        {
+            get { return nodes; }
+        }
 
         public void UpdateIcons(Texture2D folderIcon)
         {

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

@@ -17,70 +17,17 @@ public abstract class Tree<TNode, TData>: TreeBase<TNode, TData>
         public static float ItemHeight { get { return EditorGUIUtility.singleLineHeight; } }
         public static float ItemSpacing { get { return EditorGUIUtility.standardVerticalSpacing; } }
 
-        [SerializeField] public Rect Margin = new Rect();
-        [SerializeField] public Rect Padding = new Rect();
-
-        [SerializeField] public string title = string.Empty;
-        [SerializeField] public string pathSeparator = "/";
-        [SerializeField] public bool displayRootNode = true;
-        [SerializeField] public bool isCheckable = false;
         [NonSerialized] public GUIStyle FolderStyle;
         [NonSerialized] public GUIStyle TreeNodeStyle;
         [NonSerialized] public GUIStyle ActiveTreeNodeStyle;
 
-        [SerializeField] private List<TNode> nodes = new List<TNode>();
-        [SerializeField] private TNode selectedNode = null;
-
         [NonSerialized] private Stack<bool> indents = new Stack<bool>();
         [NonSerialized] private Action<TNode> rightClickNextRender;
         [NonSerialized] private TNode rightClickNextRenderNode;
 
         public bool IsInitialized { get { return Nodes != null && Nodes.Count > 0 && !String.IsNullOrEmpty(Nodes[0].Path); } }
         public bool RequiresRepaint { get; private set; }
 
-        public override TNode SelectedNode
-        {
-            get
-            {
-                if (selectedNode != null && String.IsNullOrEmpty(selectedNode.Path))
-                    selectedNode = null;
-                return selectedNode;
-            }
-            set
-            {
-                selectedNode = value;
-            }
-        }
-
-        public override string Title
-        {
-            get { return title; }
-            set { title = value; }
-        }
-
-        public override bool DisplayRootNode
-        {
-            get { return displayRootNode; }
-            set { displayRootNode = value; }
-        }
-
-        public override bool IsCheckable
-        {
-            get { return isCheckable; }
-            set { isCheckable = value; }
-        }
-
-        public override string PathSeparator
-        {
-            get { return pathSeparator; }
-            set { pathSeparator = value; }
-        }
-
-        protected override List<TNode> Nodes
-        {
-            get { return nodes; }
-        }
-
         public Rect Render(Rect containingRect, Rect rect, Vector2 scroll, Action<TNode> singleClick = null, Action<TNode> doubleClick = null, Action<TNode> rightClick = null)
         {
             if (Event.current.type != EventType.Repaint)
@@ -109,7 +56,7 @@ public Rect Render(Rect containingRect, Rect rect, Vector2 scroll, Action<TNode>
                 var titleDisplay = !(rect.y > endDisplay || rect.yMax < startDisplay);
                 if (titleDisplay)
                 {
-                    renderResult = titleNode.Render(rect, Styles.TreeIndentation, selectedNode == titleNode, FolderStyle, TreeNodeStyle, ActiveTreeNodeStyle);
+                    renderResult = titleNode.Render(rect, Styles.TreeIndentation, SelectedNode == titleNode, FolderStyle, TreeNodeStyle, ActiveTreeNodeStyle);
                 }
 
                 if (renderResult == TreeNodeRenderResult.VisibilityChange)
@@ -142,7 +89,7 @@ public Rect Render(Rect containingRect, Rect rect, Vector2 scroll, Action<TNode>
                 var display = !(rect.y > endDisplay || rect.yMax < startDisplay);
                 if (display)
                 {
-                    renderResult = node.Render(rect, Styles.TreeIndentation, selectedNode == node, FolderStyle, TreeNodeStyle, ActiveTreeNodeStyle);
+                    renderResult = node.Render(rect, Styles.TreeIndentation, SelectedNode == node, FolderStyle, TreeNodeStyle, ActiveTreeNodeStyle);
                 }
 
                 if (renderResult == TreeNodeRenderResult.VisibilityChange)
@@ -234,7 +181,7 @@ private bool HandleInput(Rect rect, TNode currentNode, int index, Action<TNode>
             }
 
             // Keyboard navigation if this child is the current selection
-            if (currentNode == selectedNode && Event.current.type == EventType.KeyDown)
+            if (currentNode == SelectedNode && Event.current.type == EventType.KeyDown)
             {
                 int directionY = Event.current.keyCode == KeyCode.UpArrow ? -1 : Event.current.keyCode == KeyCode.DownArrow ? 1 : 0;
                 int directionX = Event.current.keyCode == KeyCode.LeftArrow ? -1 : Event.current.keyCode == KeyCode.RightArrow ? 1 : 0;
@@ -541,6 +488,56 @@ public class BranchesTree : Tree<TreeNode, GitBranchTreeData>
         [NonSerialized] public Texture2D BranchIcon;
         [NonSerialized] public Texture2D FolderIcon;
         [NonSerialized] public Texture2D GlobeIcon;
+        [SerializeField] public string title = string.Empty;
+        [SerializeField] public string pathSeparator = "/";
+        [SerializeField] public bool displayRootNode = true;
+        [SerializeField] public bool isCheckable = false;
+        [SerializeField] private List<TreeNode> nodes = new List<TreeNode>();
+        [SerializeField] private TreeNode selectedNode = null;
+
+        public override string Title
+        {
+            get { return title; }
+            set { title = value; }
+        }
+
+        public override bool DisplayRootNode
+        {
+            get { return displayRootNode; }
+            set { displayRootNode = value; }
+        }
+
+        public override bool IsCheckable
+        {
+            get { return isCheckable; }
+            set { isCheckable = value; }
+        }
+
+        public override string PathSeparator
+        {
+            get { return pathSeparator; }
+            set { pathSeparator = value; }
+        }
+
+        public override TreeNode SelectedNode
+        {
+            get
+            {
+                if (selectedNode != null && String.IsNullOrEmpty(selectedNode.Path))
+                    selectedNode = null;
+
+                return selectedNode;
+            }
+            set
+            {
+                selectedNode = value;
+            }
+        }
+
+        protected override List<TreeNode> Nodes
+        {
+            get { return nodes; }
+        }
 
         public void UpdateIcons(Texture2D activeBranchIcon, Texture2D branchIcon, Texture2D folderIcon, Texture2D globeIcon)
         {