Skip to content

Commit e46174e

Browse files
authored
Merge pull request #182 from brunomikoski/fix/compile-errors-due-to-treeview
Bumped the minimum version number for the generic TreeViewState to 6000.1
2 parents af60bfa + e3883dc commit e46174e

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

Scripts/Editor/Browser/BrowserEditorWindow.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ private static void Init()
1919
private const float DIVIDER_MAXIMUM = 0.8f;
2020

2121
private BrowserTreeView treeView;
22-
#if UNITY_6000_0_OR_NEWER
22+
#if UNITY_6000_1_OR_NEWER
2323
private TreeViewState<int> treeViewState;
2424
#else
2525
private TreeViewState treeViewState;
@@ -33,7 +33,7 @@ private static void Init()
3333

3434
private void OnEnable()
3535
{
36-
#if UNITY_6000_0_OR_NEWER
36+
#if UNITY_6000_1_OR_NEWER
3737
treeViewState ??= new TreeViewState<int>();
3838
#else
3939
treeViewState ??= new TreeViewState();

Scripts/Editor/Browser/BrowserTreeView.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
namespace BrunoMikoski.ScriptableObjectCollections.Browser
77
{
8-
#if UNITY_6000_0_OR_NEWER
8+
#if UNITY_6000_1_OR_NEWER
99
public class BrowserTreeView : TreeView<int>
1010
#else
1111
public class BrowserTreeView : TreeView
@@ -20,7 +20,7 @@ public class BrowserTreeView : TreeView
2020
private readonly GUIContent showHiddenCollectionsContent = new("Show Hidden Collections");
2121
private readonly GUIContent hideHiddenCollectionsContent = new("Hide Hidden Collections");
2222

23-
#if UNITY_6000_0_OR_NEWER
23+
#if UNITY_6000_1_OR_NEWER
2424
public BrowserTreeView(TreeViewState<int> state)
2525
: base(state)
2626
{
@@ -52,7 +52,7 @@ private void Initialize()
5252
Reload();
5353
}
5454

55-
#if UNITY_6000_0_OR_NEWER
55+
#if UNITY_6000_1_OR_NEWER
5656
protected override TreeViewItem<int> BuildRoot()
5757
{
5858
TreeViewItem<int> root = new(0, -1);
@@ -128,7 +128,7 @@ protected override TreeViewItem BuildRoot()
128128
}
129129
#endif
130130

131-
#if UNITY_6000_0_OR_NEWER
131+
#if UNITY_6000_1_OR_NEWER
132132
protected override bool CanMultiSelect(TreeViewItem<int> item)
133133
#else
134134
protected override bool CanMultiSelect(TreeViewItem item)
@@ -142,7 +142,7 @@ protected override void SelectionChanged(IList<int> selectedIds)
142142
if (selectedIds.Count != 1)
143143
return;
144144

145-
#if UNITY_6000_0_OR_NEWER
145+
#if UNITY_6000_1_OR_NEWER
146146
TreeViewItem<int> item = FindItem(selectedIds[0], rootItem);
147147
#else
148148
TreeViewItem item = FindItem(selectedIds[0], rootItem);
@@ -156,7 +156,7 @@ protected override void SelectionChanged(IList<int> selectedIds)
156156

157157
protected override void SingleClickedItem(int id)
158158
{
159-
#if UNITY_6000_0_OR_NEWER
159+
#if UNITY_6000_1_OR_NEWER
160160
TreeViewItem<int> item = FindItem(id, rootItem);
161161
#else
162162
TreeViewItem item = FindItem(id, rootItem);
@@ -170,7 +170,7 @@ protected override void SingleClickedItem(int id)
170170

171171
protected override void DoubleClickedItem(int id)
172172
{
173-
#if UNITY_6000_0_OR_NEWER
173+
#if UNITY_6000_1_OR_NEWER
174174
TreeViewItem<int> item = FindItem(id, rootItem);
175175
#else
176176
TreeViewItem item = FindItem(id, rootItem);
@@ -184,7 +184,7 @@ protected override void DoubleClickedItem(int id)
184184

185185
protected override void ContextClickedItem(int id)
186186
{
187-
#if UNITY_6000_0_OR_NEWER
187+
#if UNITY_6000_1_OR_NEWER
188188
TreeViewItem<int> item = FindItem(id, rootItem);
189189
#else
190190
TreeViewItem item = FindItem(id, rootItem);

Scripts/Editor/Browser/BrowserTreeViewItem.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
namespace BrunoMikoski.ScriptableObjectCollections.Browser
55
{
6-
#if UNITY_6000_0_OR_NEWER
6+
#if UNITY_6000_1_OR_NEWER
77
public class BrowserTreeViewItem : TreeViewItem<int>
88
#else
99
public class BrowserTreeViewItem : TreeViewItem

0 commit comments

Comments
 (0)