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

Functionality to mark folder nodes as "root" #469

Conversation

StanleyGoldman
Copy link
Contributor

@StanleyGoldman StanleyGoldman commented Nov 27, 2017

Note: This branch targets enhancements/branches-view-rollup #464

Fixes #454

  • Renaming icons to be something more useful
  • Adding functionality to render the globe icon at the right time

Depends on:

@StanleyGoldman StanleyGoldman mentioned this pull request Nov 27, 2017
15 tasks
@StanleyGoldman StanleyGoldman changed the title Fix to branches view globe icon Branches view functionality to mark folder nodes as "root" Nov 27, 2017
@StanleyGoldman StanleyGoldman changed the title Branches view functionality to mark folder nodes as "root" Functionality to mark folder nodes as "root" Nov 27, 2017
@StanleyGoldman StanleyGoldman changed the base branch from master to enhancements/branches-view-rollup November 29, 2017 15:39
treeLocals.NodeIcon = Styles.BranchIcon;
treeLocals.FolderIcon = Styles.FolderIcon;

treeRemotes = new Tree();

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

treeLocals and treeRemotes are always either defined or null together right? It isn't worth having a separate if for treeRemotes?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They always get instantiated together, so I figured I could save the boolean check.

@@ -383,7 +385,7 @@ private void ResetNodeIcons(TreeNode node)
}
else if (node.IsFolder)
{
if (node.Level == 1)
if (node.Level == RootFolderIconLevel)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why was this switched from 1 to -1?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You know what. It's a rudimentary fix for something that i'm already having to change.
I'm going to send a PR before this one that provides a correct solution instead.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good

@StanleyGoldman StanleyGoldman force-pushed the fixes/branches-view-globe-icon branch from 3d80dc3 to 3dcc13e Compare November 29, 2017 23:00
…anches-view-globe-icon

# Conflicts:
#	src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs
#	src/UnityExtension/Assets/Editor/GitHub.Unity/UI/TreeControl.cs
…ixes/branches-view-globe-icon

# Conflicts:
#	src/UnityExtension/Assets/Editor/GitHub.Unity/UI/TreeControl.cs
Copy link

@drguthals drguthals left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@StanleyGoldman StanleyGoldman merged commit 1d3bdf1 into enhancements/branches-view-rollup Nov 30, 2017
@StanleyGoldman StanleyGoldman deleted the fixes/branches-view-globe-icon branch November 30, 2017 01:20
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants