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

Commit cd3a65a

Browse files
Renaming fields
1 parent 9409168 commit cd3a65a

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

src/UnityExtension/Assets/Editor/GitHub.Unity/Misc/Styles.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -832,7 +832,7 @@ public static Texture2D DropdownListIcon
832832
}
833833

834834
private static Texture2D rootFolderIcon;
835-
public static Texture2D RootFolderIcon
835+
public static Texture2D GlobeIcon
836836
{
837837
get
838838
{

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,12 +160,12 @@ private void UpdateTreeIcons()
160160
{
161161
if (treeLocals != null)
162162
{
163-
treeLocals.UpdateIcons(Styles.ActiveBranchIcon, Styles.BranchIcon, Styles.FolderIcon, Styles.RootFolderIcon);
163+
treeLocals.UpdateIcons(Styles.ActiveBranchIcon, Styles.BranchIcon, Styles.FolderIcon, Styles.GlobeIcon);
164164
}
165165

166166
if (treeRemotes != null)
167167
{
168-
treeRemotes.UpdateIcons(Styles.ActiveBranchIcon, Styles.BranchIcon, Styles.FolderIcon, Styles.RootFolderIcon);
168+
treeRemotes.UpdateIcons(Styles.ActiveBranchIcon, Styles.BranchIcon, Styles.FolderIcon, Styles.GlobeIcon);
169169
}
170170
}
171171

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -455,22 +455,22 @@ public class BranchesTree: Tree
455455
{
456456
[SerializeField] public bool IsRemote;
457457

458-
[NonSerialized] public Texture2D ActiveNodeIcon;
458+
[NonSerialized] public Texture2D ActiveBranchIcon;
459459
[NonSerialized] public Texture2D BranchIcon;
460460
[NonSerialized] public Texture2D FolderIcon;
461-
[NonSerialized] public Texture2D RemoteIcon;
461+
[NonSerialized] public Texture2D GlobeIcon;
462462

463463
protected override Texture2D GetNodeIcon(TreeNode node)
464464
{
465465
Texture2D nodeIcon;
466466
if (node.IsActive)
467467
{
468-
nodeIcon = ActiveNodeIcon;
468+
nodeIcon = ActiveBranchIcon;
469469
}
470470
else if (node.IsFolder)
471471
{
472472
nodeIcon = IsRemote && node.Level == 1
473-
? RemoteIcon
473+
? GlobeIcon
474474
: FolderIcon;
475475
}
476476
else
@@ -481,15 +481,15 @@ protected override Texture2D GetNodeIcon(TreeNode node)
481481
}
482482

483483

484-
public void UpdateIcons(Texture2D activeBranchIcon, Texture2D branchIcon, Texture2D folderIcon, Texture2D rootFolderIcon)
484+
public void UpdateIcons(Texture2D activeBranchIcon, Texture2D branchIcon, Texture2D folderIcon, Texture2D globeIcon)
485485
{
486-
var needsLoad = ActiveNodeIcon == null || BranchIcon == null || FolderIcon == null || RemoteIcon == null;
486+
var needsLoad = ActiveBranchIcon == null || BranchIcon == null || FolderIcon == null || GlobeIcon == null;
487487
if (needsLoad)
488488
{
489-
ActiveNodeIcon = activeBranchIcon;
489+
ActiveBranchIcon = activeBranchIcon;
490490
BranchIcon = branchIcon;
491491
FolderIcon = folderIcon;
492-
RemoteIcon = rootFolderIcon;
492+
GlobeIcon = globeIcon;
493493

494494
LoadNodeIcons();
495495
}

0 commit comments

Comments
 (0)