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

Tree Style Reloading #507

Merged
StanleyGoldman merged 3 commits into from
Dec 5, 2017
Merged

Tree Style Reloading #507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e9d487e
Adding functionality to update styles
StanleyGoldman Dec 4, 2017
14d16fe
Fixing styles that get used in the Tree
StanleyGoldman Dec 5, 2017
4d5387f
Nit picking code
StanleyGoldman Dec 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/UnityExtension/Assets/Editor/GitHub.Unity/Misc/Utility.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ public static Texture2D GetTextureFromColor(Color color)
pix[0] = color;

Texture2D result = new Texture2D(1, 1);
result.hideFlags = HideFlags.HideAndDontSave;
result.SetPixels(pix);
result.Apply();

Expand Down
30 changes: 19 additions & 11 deletions src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,23 @@ private void UpdateTreeIcons()
}
}

private void UpdateTreeStyles()
{
if (treeLocals != null && treeLocals.FolderStyle == null)
{
treeLocals.FolderStyle = Styles.Foldout;
treeLocals.TreeNodeStyle = Styles.TreeNode;
treeLocals.ActiveTreeNodeStyle = Styles.TreeNodeActive;
}

if (treeRemotes != null && treeRemotes.FolderStyle == null)
{
treeRemotes.FolderStyle = Styles.Foldout;
treeRemotes.TreeNodeStyle = Styles.TreeNode;
treeRemotes.ActiveTreeNodeStyle = Styles.TreeNodeActive;
}
}

private void OnButtonBarGUI()
{
if (mode == BranchesMode.Default)
Expand Down Expand Up @@ -295,18 +312,9 @@ private void OnButtonBarGUI()

private void OnTreeGUI(Rect rect)
{
var initialRect = rect;

if (treeLocals.FolderStyle == null)
{
treeLocals.FolderStyle = Styles.Foldout;
treeLocals.TreeNodeStyle = Styles.TreeNode;
treeLocals.ActiveTreeNodeStyle = Styles.TreeNodeActive;
treeRemotes.FolderStyle = Styles.Foldout;
treeRemotes.TreeNodeStyle = Styles.TreeNode;
treeRemotes.ActiveTreeNodeStyle = Styles.TreeNodeActive;
}
UpdateTreeStyles();

var initialRect = rect;
var treeHadFocus = treeLocals.SelectedNode != null;

rect = treeLocals.Render(rect, scroll,
Expand Down
6 changes: 3 additions & 3 deletions src/UnityExtension/Assets/Editor/GitHub.Unity/UI/TreeControl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ public abstract class Tree
[SerializeField] public Rect Margin = new Rect();
[SerializeField] public Rect Padding = new Rect();

[SerializeField] public GUIStyle FolderStyle;
[SerializeField] public GUIStyle TreeNodeStyle;
[SerializeField] public GUIStyle ActiveTreeNodeStyle;
[NonSerialized] public GUIStyle FolderStyle;
[NonSerialized] public GUIStyle TreeNodeStyle;
[NonSerialized] public GUIStyle ActiveTreeNodeStyle;

[SerializeField] private List<TreeNode> nodes = new List<TreeNode>();
[SerializeField] private TreeNode selectedNode = null;
Expand Down