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

Changes TreeView Rollup #471

Merged
merged 143 commits into from
Dec 10, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
143 commits
Select commit Hold shift + click to select a range
4fc10a8
Merge branch 'enhancements/branches-view-rollup' into enhancements/ch…
StanleyGoldman Nov 30, 2017
6dc2dd0
Merge branch 'enhancements/changes-tree-view-rollup' into enhancement…
StanleyGoldman Nov 30, 2017
1087add
Making the path separator configurable
StanleyGoldman Nov 28, 2017
b164664
Adding functionality to ignore a common path root
StanleyGoldman Nov 28, 2017
851ae97
Adding functionality to control the display of the root node
StanleyGoldman Nov 28, 2017
6115784
Adding functionality to make tree node elements selectable
StanleyGoldman Nov 28, 2017
be6ae91
Code cleanup
StanleyGoldman Nov 29, 2017
2936899
Initial functionality to select file nodes
StanleyGoldman Nov 29, 2017
412ff10
Renaming the concept of selection to checking
StanleyGoldman Nov 29, 2017
656007e
Preventing an error that occurs where there are no items to display
StanleyGoldman Nov 29, 2017
0de3651
Merge branch 'enhancements/changes-tree-view-rollup' into enhancement…
StanleyGoldman Nov 30, 2017
e36d932
Merge branch 'enhancements/tree-improvements' into enhancements/chang…
StanleyGoldman Nov 30, 2017
bc4947c
Starting to figure out the ChangesView
StanleyGoldman Nov 28, 2017
1b17338
Displaying the new Tree control
StanleyGoldman Nov 28, 2017
6a97608
Creating Tree instance at the right times
StanleyGoldman Nov 28, 2017
22261be
Setting the path seperator
StanleyGoldman Nov 28, 2017
563d60e
Specifying the ignore root
StanleyGoldman Nov 28, 2017
887e6cf
Hiding the root node
StanleyGoldman Nov 28, 2017
1c5106d
Setting appropriate values
StanleyGoldman Nov 28, 2017
30c6588
Fixing the display of changes
StanleyGoldman Nov 28, 2017
91d0cb2
Removing some copy pasta code that handles switch focus between trees…
StanleyGoldman Nov 28, 2017
59b83ca
Fixing ChangesTree display
StanleyGoldman Nov 28, 2017
d181016
Updating ChangesView to update tree icons accordingly
StanleyGoldman Nov 29, 2017
35c13a7
Repository should never be null
StanleyGoldman Nov 29, 2017
e2a1311
Tree is null in intiial OnEnable call
StanleyGoldman Nov 29, 2017
cc9d641
Renaming variable after merge
StanleyGoldman Nov 29, 2017
00ddff9
Changes made after rebase
StanleyGoldman Nov 30, 2017
45e24f5
Starting changes to ChangesTreeView
StanleyGoldman Nov 30, 2017
0a3ebd0
Separating GitBranch from ITreeData
StanleyGoldman Nov 30, 2017
36ba00a
Rename Name to Path
StanleyGoldman Nov 30, 2017
bcbb79a
Making functionality static so I can move it to test
StanleyGoldman Nov 30, 2017
b908ac1
Isolating TreeLoader
StanleyGoldman Nov 30, 2017
a76dbc0
Moving Title to Tree
StanleyGoldman Nov 30, 2017
88edbb5
Removing PathIgnoreRoot as it should not be needed
StanleyGoldman Nov 30, 2017
bc9bc83
Adding blank tests
StanleyGoldman Nov 30, 2017
2bf63ba
Adding setters for a few properties
StanleyGoldman Nov 30, 2017
91b9afe
Merge branch 'enhancements/tree-improvements' into enhancements/chang…
StanleyGoldman Nov 30, 2017
9ca2d26
Fixes needed after merge
StanleyGoldman Nov 30, 2017
598c96e
Removing unused property
StanleyGoldman Nov 30, 2017
e8d0b1b
Merge branch 'enhancements/tree-improvements' into enhancements/chang…
StanleyGoldman Nov 30, 2017
9234d39
Removing FullPath
StanleyGoldman Nov 30, 2017
56a348c
Merge branch 'enhancements/tree-improvements' into enhancements/chang…
StanleyGoldman Nov 30, 2017
2cec819
Functionality to provide custom icon and icon badge for the changes t…
StanleyGoldman Nov 30, 2017
8b3b3a4
Merge branch 'enhancements/branches-view-rollup' into enhancements/ch…
StanleyGoldman Dec 1, 2017
172d5d0
Merge branch 'enhancements/changes-tree-view-rollup' into enhancement…
StanleyGoldman Dec 1, 2017
3e4f470
Merge branch 'enhancements/tree-improvements' into enhancements/chang…
StanleyGoldman Dec 1, 2017
fe97196
Merge branch 'enhancements/branches-view-rollup' into enhancements/ch…
StanleyGoldman Dec 5, 2017
03f3f18
Merge branch 'fixes/changes-view-reload' into enhancements/changes-tr…
StanleyGoldman Dec 5, 2017
19386b8
Merge branch 'enhancements/branches-view-rollup' into enhancements/tr…
StanleyGoldman Dec 5, 2017
994ba2c
Merge branch 'enhancements/skip-render-hidden-nodes' into enhancement…
StanleyGoldman Dec 5, 2017
d53009b
Merge branch 'enhancements/skip-render-hidden-nodes' into enhancement…
StanleyGoldman Dec 6, 2017
9bc408b
Merge branch 'enhancements/changes-tree-view-rollup' into enhancement…
StanleyGoldman Dec 6, 2017
8ffcb2e
Renaming properties
StanleyGoldman Dec 6, 2017
0acb9fe
Merge branch 'master' into enhancements/changes-tree-view-rollup
StanleyGoldman Dec 6, 2017
c42a78d
Merge branch 'enhancements/changes-tree-view-rollup' into enhancement…
StanleyGoldman Dec 6, 2017
5f011ad
Merge branch 'enhancements/tree-improvements' into enhancements/chang…
StanleyGoldman Dec 6, 2017
c97d828
Changes needed after merge
StanleyGoldman Dec 6, 2017
05c0c93
Removing some debug statement
StanleyGoldman Dec 6, 2017
77f6b8d
Merge branch 'enhancements/tree-improvements' into enhancements/chang…
StanleyGoldman Dec 6, 2017
2c577d4
Merge branch 'fixes/first-folder-selected' into enhancements/changes-…
StanleyGoldman Dec 6, 2017
431fa52
Merge branch 'enhancements/changes-tree-view-rollup' into enhancement…
StanleyGoldman Dec 6, 2017
23d5645
Merge branch 'enhancements/tree-improvements' into enhancements/chang…
StanleyGoldman Dec 6, 2017
7e19110
Merge branch 'master' into enhancements/changes-tree-view-rollup
StanleyGoldman Dec 6, 2017
9a0caf9
Merge branch 'enhancements/changes-tree-view-rollup' into enhancement…
StanleyGoldman Dec 6, 2017
ac619e1
Merge branch 'enhancements/tree-improvements' into enhancements/chang…
StanleyGoldman Dec 6, 2017
2b9cdb5
Merge branch 'enhancements/tree-improvements' into enhancements/tree-…
StanleyGoldman Dec 6, 2017
1dac0e2
Starting to ripple the checked state up through the tree
StanleyGoldman Dec 6, 2017
bd15739
Trying to fix the ripple effect
StanleyGoldman Dec 6, 2017
1fc7a8a
Some code cleanup
StanleyGoldman Dec 6, 2017
9332fba
Merge branch 'enhancements/tree-view-checked-state' into enhancements…
StanleyGoldman Dec 6, 2017
43f4d1e
Completing the functionality to toggle checks
StanleyGoldman Dec 6, 2017
3e7861a
This can be called when the tree objects are null
StanleyGoldman Dec 6, 2017
1b64ba3
Merge branch 'enhancements/tree-view-checked-state' into enhancements…
StanleyGoldman Dec 6, 2017
9ef7838
Merge pull request #476 from github-for-unity/enhancements/tree-impro…
StanleyGoldman Dec 6, 2017
c0b2841
This can be called when the tree objects are null
StanleyGoldman Dec 6, 2017
617302c
Merge branch 'enhancements/changes-tree-view-rollup' into enhancement…
StanleyGoldman Dec 6, 2017
94a9729
Merge branch 'enhancements/tree-view-checked-state' into enhancements…
StanleyGoldman Dec 6, 2017
2590be4
Being sure to seek for the first sibling
StanleyGoldman Dec 6, 2017
26c5b32
Merge branch 'enhancements/tree-view-checked-state' into enhancements…
StanleyGoldman Dec 6, 2017
4fbfdf5
Storing commit-able entries instead of all
StanleyGoldman Dec 6, 2017
2e9edc8
Trigger a toggle on spacebar
StanleyGoldman Dec 6, 2017
b7c4f70
Removing activeNode as it is not used
StanleyGoldman Dec 6, 2017
bccbe5e
Adding functionality to track checked files
StanleyGoldman Dec 6, 2017
2a65f7b
Merge branch 'enhancements/tree-view-checked-state' into enhancements…
StanleyGoldman Dec 6, 2017
0ea6d54
Checking for checked files
StanleyGoldman Dec 6, 2017
90cf702
Removing files from the checked list
StanleyGoldman Dec 6, 2017
1e40ab8
Merge branch 'enhancements/tree-view-checked-state' into enhancements…
StanleyGoldman Dec 6, 2017
78d28c7
Tracking the correct node
StanleyGoldman Dec 6, 2017
b16c09f
Merge branch 'enhancements/tree-view-checked-state' into enhancements…
StanleyGoldman Dec 6, 2017
8d5b4c4
Checking for null trees
StanleyGoldman Dec 6, 2017
bdc1ebb
Correcting how child nodes are identified
StanleyGoldman Dec 6, 2017
7967fbd
Merge branch 'enhancements/tree-view-checked-state' into enhancements…
StanleyGoldman Dec 6, 2017
b98e496
Checking the previous state of an item when checking a nodes children
StanleyGoldman Dec 6, 2017
66b7c94
Merge branch 'enhancements/tree-view-checked-state' into enhancements…
StanleyGoldman Dec 6, 2017
63be72b
Merge remote-tracking branch 'remotes/origin/fixes/git-status-entry-d…
StanleyGoldman Dec 6, 2017
436787a
Merge branch 'enhancements/changes-tree-view-rollup' into enhancement…
StanleyGoldman Dec 6, 2017
6d9e853
Merge branch 'master' into enhancements/changes-tree-view-rollup
StanleyGoldman Dec 7, 2017
8dd8eb9
Merge branch 'enhancements/changes-tree-view-rollup' into enhancement…
StanleyGoldman Dec 7, 2017
0340100
Merge branch 'enhancements/tree-view-checked-state' into enhancements…
StanleyGoldman Dec 7, 2017
11686f5
Merge pull request #511 from github-for-unity/enhancements/tree-view-…
StanleyGoldman Dec 7, 2017
24426bf
Isolating functionality into TreeBase
StanleyGoldman Dec 6, 2017
5ac76bb
Merge branch 'fixes/refactor-tree-view' into enhancements/changes-tre…
StanleyGoldman Dec 7, 2017
31c6d55
Merge branch 'enhancements/changes-tree-view-rollup' into fixes/refac…
StanleyGoldman Dec 7, 2017
3df5773
Renaming variable
StanleyGoldman Dec 7, 2017
e9bc27e
Removing project change
StanleyGoldman Dec 7, 2017
73cff09
Merge branch 'fixes/refactor-tree-view' into enhancements/changes-tre…
StanleyGoldman Dec 7, 2017
4ce2aa7
Defaulting title to empty string
StanleyGoldman Dec 7, 2017
74c8358
Merge branch 'master' into fixes/refactor-tree-view
StanleyGoldman Dec 7, 2017
21902d4
Merge branch 'fixes/refactor-tree-view' into enhancements/changes-tre…
StanleyGoldman Dec 7, 2017
f528378
Merge pull request #513 from github-for-unity/fixes/refactor-tree-view
StanleyGoldman Dec 7, 2017
49d7a97
Merge branch 'enhancements/changes-tree-view-rollup' into enhancement…
StanleyGoldman Dec 7, 2017
e2b2a19
Code cleanup
StanleyGoldman Dec 7, 2017
961c997
Restoring functionality to work with trees
StanleyGoldman Dec 7, 2017
9bed325
Better control of checked nodes
StanleyGoldman Dec 7, 2017
60df3fb
Changes
StanleyGoldman Dec 7, 2017
4ed230a
Tweaking code formatting
StanleyGoldman Dec 7, 2017
a2f84dd
Placing elements in the tree view
StanleyGoldman Dec 7, 2017
943da43
Merge branch 'fixes/update-status-on-commit' into enhancements/change…
StanleyGoldman Dec 7, 2017
2099721
Too many event use calls
StanleyGoldman Dec 8, 2017
bccabdf
Better control over styles and tree focus
StanleyGoldman Dec 8, 2017
023d813
Merge branch 'master' into enhancements/changes-tree-view-rollup
StanleyGoldman Dec 8, 2017
58a4a73
Merge branch 'enhancements/changes-tree-view-rollup' into enhancement…
StanleyGoldman Dec 8, 2017
2e26005
Removing some old code
StanleyGoldman Dec 8, 2017
b65fc78
Removing code used for debugging
StanleyGoldman Dec 8, 2017
5704e7b
Merge branch 'enhancements/changes-tree-view' into fixes/changes-view…
StanleyGoldman Dec 8, 2017
11fcdc3
Removing unused parameters
StanleyGoldman Dec 8, 2017
8431c59
Merge branch 'enhancements/changes-tree-view' into fixes/changes-view…
StanleyGoldman Dec 8, 2017
c1f8e7f
Adding missing ProjectPath property
StanleyGoldman Dec 8, 2017
0698ccf
Merge branch 'enhancements/changes-tree-view' into fixes/changes-view…
StanleyGoldman Dec 8, 2017
62a0f82
Renaming method for clarity
StanleyGoldman Dec 8, 2017
3df7f67
Merge pull request #475 from github-for-unity/enhancements/changes-tr…
StanleyGoldman Dec 8, 2017
d954351
Merge branch 'enhancements/changes-tree-view-rollup' into fixes/chang…
StanleyGoldman Dec 8, 2017
8ffecb0
Attempting to change focus on the change of focus to another control
StanleyGoldman Dec 8, 2017
fd144fa
A less intrusive way of supporting tree selection
StanleyGoldman Dec 8, 2017
ac4970c
I thought this works
StanleyGoldman Dec 8, 2017
ff89b1b
Moving serialized fields down to derived classes for best milage
StanleyGoldman Dec 8, 2017
41de08f
Merge branch 'fixes/base-classes-with-serailized-fields' into fixes/c…
StanleyGoldman Dec 8, 2017
664878f
Using the selectionObject to clear focus
StanleyGoldman Dec 8, 2017
1fc47a6
Final focus tweaks
StanleyGoldman Dec 8, 2017
756b7e5
Merge pull request #520 from github-for-unity/fixes/base-classes-with…
StanleyGoldman Dec 8, 2017
3f8ccf9
Merge branch 'enhancements/changes-tree-view-rollup' into fixes/chang…
StanleyGoldman Dec 8, 2017
fb9ed25
Merge pull request #518 from github-for-unity/fixes/changes-view-tree…
StanleyGoldman Dec 8, 2017
3fee519
Merge branch 'master' into enhancements/changes-tree-view-rollup
StanleyGoldman Dec 10, 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
8 changes: 1 addition & 7 deletions src/GitHub.Api/Git/GitBranch.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,8 @@

namespace GitHub.Unity
{
public interface ITreeData
{
string Name { get; }
bool IsActive { get; }
}

[Serializable]
public struct GitBranch : ITreeData
public struct GitBranch
{
public static GitBranch Default = new GitBranch();

Expand Down
46 changes: 46 additions & 0 deletions src/GitHub.Api/Git/TreeData.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
using System;

namespace GitHub.Unity
{
public interface ITreeData
{
string Path { get; }
bool IsActive { get; }
}

[Serializable]
public struct GitBranchTreeData : ITreeData
{
public static GitBranchTreeData Default = new GitBranchTreeData(Unity.GitBranch.Default);

public GitBranch GitBranch;

public GitBranchTreeData(GitBranch gitBranch)
{
GitBranch = gitBranch;
}

public string Path => GitBranch.Name;
public bool IsActive => GitBranch.IsActive;
}

[Serializable]
public struct GitStatusEntryTreeData : ITreeData
{
public static GitStatusEntryTreeData Default = new GitStatusEntryTreeData(GitStatusEntry.Default);

public GitStatusEntry gitStatusEntry;

public GitStatusEntryTreeData(GitStatusEntry gitStatusEntry)
{
this.gitStatusEntry = gitStatusEntry;
}

public string Path => gitStatusEntry.Path;
public string ProjectPath => gitStatusEntry.ProjectPath;
public bool IsActive => false;
public GitStatusEntry GitStatusEntry => gitStatusEntry;

public GitFileStatus FileStatus => gitStatusEntry.Status;
}
}
3 changes: 3 additions & 0 deletions src/GitHub.Api/GitHub.Api.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@
<Compile Include="Git\Tasks\GitAheadBehindStatusTask.cs" />
<Compile Include="Git\Tasks\GitLfsVersionTask.cs" />
<Compile Include="Git\Tasks\GitVersionTask.cs" />
<Compile Include="Git\TreeData.cs" />
<Compile Include="Git\ValidateGitInstallResult.cs" />
<Compile Include="Helpers\AssemblyResources.cs" />
<Compile Include="Authentication\IKeychain.cs" />
Expand Down Expand Up @@ -237,6 +238,7 @@
<Compile Include="Git\GitCredentialManager.cs" />
<Compile Include="UI\FileTreeNode.cs" />
<Compile Include="UI\GitCommitTarget.cs" />
<Compile Include="UI\TreeBase.cs" />
<Compile Include="UI\TreeBuilder.cs" />
</ItemGroup>
<Choose>
Expand Down Expand Up @@ -294,6 +296,7 @@
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
Loading