Skip to content
This repository was archived by the owner on Dec 5, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
839e518
Removing ChangesetTreeView
StanleyGoldman Nov 28, 2017
fb29c68
Removing more old stuff
StanleyGoldman Nov 30, 2017
bb9cf8b
Merge branch 'enhancements/branches-view-rollup' into enhancements/re…
StanleyGoldman Dec 1, 2017
0f5d2ab
Merge branch 'master' into enhancements/removing-old-tree-code
StanleyGoldman Dec 6, 2017
03e6346
Merge branch 'enhancements/changes-tree-view' into enhancements/remov…
StanleyGoldman Dec 6, 2017
d78cf98
Merge branch 'master' into enhancements/removing-old-tree-code
StanleyGoldman Dec 10, 2017
ab14d79
Start of a HistoryControl
StanleyGoldman Dec 11, 2017
745af6f
Merge branch 'fixes/git-log-entry-default' into enhancements/history-…
StanleyGoldman Dec 12, 2017
80627b9
Completing HistoryControl
StanleyGoldman Dec 12, 2017
e4b68dc
Merge branch 'fixes/git-log-entry-default' into enhancements/history-…
StanleyGoldman Dec 12, 2017
f7acb86
Managing scroll and maintaining selected index in HistoryControl
StanleyGoldman Dec 12, 2017
4f7ceac
Maintaining scroll state when history items get added
StanleyGoldman Dec 12, 2017
e4fa5d0
Merge branch 'enhancements/history-list-view' into enhancements/histo…
StanleyGoldman Dec 12, 2017
8ee7353
Integrating tree control into history view
StanleyGoldman Dec 12, 2017
7ad7355
Merge branch 'enhancements/non-selectable-tree' into enhancements/his…
StanleyGoldman Dec 12, 2017
ff03fe2
Setting value
StanleyGoldman Dec 12, 2017
5c5074a
Realizing the extra scrollView
StanleyGoldman Dec 12, 2017
7fde8d1
Removing unused enum
StanleyGoldman Dec 13, 2017
6090cd8
Minor cleanup
StanleyGoldman Dec 13, 2017
021f406
Merge branch 'enhancements/history-list-view' into enhancements/histo…
StanleyGoldman Dec 13, 2017
39b8aed
Merge branch 'fixes/simplify-tree-render-arguments' into enhancements…
StanleyGoldman Dec 13, 2017
a3d9b73
Merge branch 'fixes/simplify-tree-render-arguments' into enhancements…
StanleyGoldman Dec 13, 2017
13b06b8
Fix needed after merge
StanleyGoldman Dec 13, 2017
a1c2d2c
Another after merge fix
StanleyGoldman Dec 13, 2017
0cc336b
Merge branch 'master' into enhancements/history-detail-tree-view-rollup
StanleyGoldman Dec 13, 2017
f2ba4f0
Merge branch 'enhancements/history-detail-tree-view-rollup' into enha…
StanleyGoldman Dec 13, 2017
82cc3ae
Merge branch 'enhancements/history-list-view' into enhancements/histo…
StanleyGoldman Dec 13, 2017
a7a3b20
Merge branch 'fixes/simplify-tree-render-arguments' into enhancements…
StanleyGoldman Dec 13, 2017
06dd54e
Trying to set the position of the tree control
StanleyGoldman Dec 13, 2017
d0ac82e
Correcting the scroll and setting the padding on the tree view
StanleyGoldman Dec 13, 2017
eead5e4
Merge branch 'enhancements/history-detail-tree-view' into enhancement…
StanleyGoldman Dec 13, 2017
82b0489
Merge branch 'master' into enhancements/history-detail-tree-view-rollup
StanleyGoldman Dec 13, 2017
55b4a5d
Merge branch 'enhancements/history-detail-tree-view-rollup' into enha…
StanleyGoldman Dec 13, 2017
8b49a44
Merge pull request #523 from github-for-unity/enhancements/history-li…
StanleyGoldman Dec 13, 2017
d6df408
Merge branch 'master' into enhancements/history-detail-tree-view-rollup
StanleyGoldman Dec 13, 2017
88e8585
Merge branch 'enhancements/history-detail-tree-view-rollup' into enha…
StanleyGoldman Dec 13, 2017
f3cb5e3
Merge branch 'enhancements/history-detail-tree-view-rollup' into enha…
StanleyGoldman Dec 13, 2017
b4d23e1
Initializing and setting Tree properties in field initializers
StanleyGoldman Dec 13, 2017
7dce10d
Undoing global selection
StanleyGoldman Dec 14, 2017
4af80f7
Functionality to make global selection optional
StanleyGoldman Dec 14, 2017
098ad7a
Merge branch 'enhancements/history-detail-tree-view' into fixes/globa…
StanleyGoldman Dec 14, 2017
765fa83
Setting IsUsingGlobalSelection property
StanleyGoldman Dec 14, 2017
60c338a
Cleaning up some method calls
StanleyGoldman Dec 14, 2017
98ce81f
Changing SelectedNode based on Selection.activeObject
StanleyGoldman Dec 14, 2017
e7b5c77
A large correction to the global selection mechanism
StanleyGoldman Dec 14, 2017
947e2b9
Merge branch 'fixes/global-selection-abuse' into fixes/tree-on-busy
StanleyGoldman Dec 14, 2017
aa9cdeb
Disabling the tree when it is busy
StanleyGoldman Dec 14, 2017
cbe019b
Merge pull request #525 from github-for-unity/enhancements/history-de…
StanleyGoldman Dec 14, 2017
d54e515
Merge branch 'master' into enhancements/history-detail-tree-view-rollup
StanleyGoldman Dec 14, 2017
e48b666
Merge remote-tracking branch 'remotes/origin/enhancements/history-det…
StanleyGoldman Dec 14, 2017
20a7e5c
Merge branch 'enhancements/history-detail-tree-view-rollup' into fixe…
StanleyGoldman Dec 14, 2017
dc43da1
Merge pull request #492 from github-for-unity/enhancements/removing-o…
StanleyGoldman Dec 14, 2017
663b3e0
Merge branch 'enhancements/history-detail-tree-view-rollup' into fixe…
StanleyGoldman Dec 14, 2017
67adb7b
Merge pull request #536 from github-for-unity/fixes/global-selection-…
StanleyGoldman Dec 14, 2017
236fb9a
Merge branch 'enhancements/history-detail-tree-view-rollup' into fixe…
StanleyGoldman Dec 14, 2017
1858a98
Undoing a code edit
StanleyGoldman Dec 14, 2017
322cd24
Merge pull request #538 from github-for-unity/fixes/tree-on-busy
StanleyGoldman Dec 14, 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
3 changes: 0 additions & 3 deletions src/GitHub.Api/GitHub.Api.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -236,10 +236,7 @@
<Compile Include="Extensions\UriExtensions.cs" />
<Compile Include="Platform\Platform.cs" />
<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>
<When Condition="$(Buildtype) == 'Internal'">
Expand Down
143 changes: 0 additions & 143 deletions src/GitHub.Api/UI/FileTreeNode.cs

This file was deleted.

23 changes: 0 additions & 23 deletions src/GitHub.Api/UI/GitCommitTarget.cs

This file was deleted.

146 changes: 0 additions & 146 deletions src/GitHub.Api/UI/TreeBuilder.cs

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@
<Compile Include="Tools\MozRoots.cs" />
<Compile Include="UI\AuthenticationView.cs" />
<Compile Include="UI\BranchesView.cs" />
<Compile Include="UI\ChangesetTreeView.cs" />
<Compile Include="UI\ChangesView.cs" />
<Compile Include="UI\HistoryView.cs" />
<Compile Include="UI\IView.cs" />
Expand Down
17 changes: 17 additions & 0 deletions src/UnityExtension/Assets/Editor/GitHub.Unity/Misc/Styles.cs
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ class Styles
headerDescriptionStyle,
historyToolbarButtonStyle,
historyLockStyle,
historyEntrySummaryStyle,
historyEntryDetailsStyle,
historyEntryDetailsRightStyle,
historyFileTreeBoxStyle,
Expand Down Expand Up @@ -396,6 +397,20 @@ public static GUIStyle HistoryLockStyle
return historyLockStyle;
}
}
public static GUIStyle HistoryEntrySummaryStyle
{
get
{
if (historyEntrySummaryStyle == null)
{
historyEntrySummaryStyle = new GUIStyle(Label);
historyEntrySummaryStyle.name = "HistoryEntrySummaryStyle";

historyEntrySummaryStyle.contentOffset = new Vector2(BaseSpacing * 2, 0);
}
return historyEntrySummaryStyle;
}
}

public static GUIStyle HistoryEntryDetailsStyle
{
Expand All @@ -412,6 +427,8 @@ public static GUIStyle HistoryEntryDetailsStyle
historyEntryDetailsStyle.onNormal.textColor = Label.onNormal.textColor;
historyEntryDetailsStyle.onFocused.background = Label.onFocused.background;
historyEntryDetailsStyle.onFocused.textColor = Label.onFocused.textColor;

historyEntryDetailsStyle.contentOffset = new Vector2(BaseSpacing * 2, 0);
}
return historyEntryDetailsStyle;
}
Expand Down
Loading