Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions Scripts/Editor/Browser/BrowserEditorWindow.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ private static void Init()
private const float DIVIDER_MAXIMUM = 0.8f;

private BrowserTreeView treeView;
#if UNITY_6000_0_OR_NEWER
#if UNITY_6000_1_OR_NEWER
private TreeViewState<int> treeViewState;
#else
private TreeViewState treeViewState;
Expand All @@ -33,7 +33,7 @@ private static void Init()

private void OnEnable()
{
#if UNITY_6000_0_OR_NEWER
#if UNITY_6000_1_OR_NEWER
treeViewState ??= new TreeViewState<int>();
#else
treeViewState ??= new TreeViewState();
Expand Down
16 changes: 8 additions & 8 deletions Scripts/Editor/Browser/BrowserTreeView.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

namespace BrunoMikoski.ScriptableObjectCollections.Browser
{
#if UNITY_6000_0_OR_NEWER
#if UNITY_6000_1_OR_NEWER
public class BrowserTreeView : TreeView<int>
#else
public class BrowserTreeView : TreeView
Expand All @@ -20,7 +20,7 @@ public class BrowserTreeView : TreeView
private readonly GUIContent showHiddenCollectionsContent = new("Show Hidden Collections");
private readonly GUIContent hideHiddenCollectionsContent = new("Hide Hidden Collections");

#if UNITY_6000_0_OR_NEWER
#if UNITY_6000_1_OR_NEWER
public BrowserTreeView(TreeViewState<int> state)
: base(state)
{
Expand Down Expand Up @@ -52,7 +52,7 @@ private void Initialize()
Reload();
}

#if UNITY_6000_0_OR_NEWER
#if UNITY_6000_1_OR_NEWER
protected override TreeViewItem<int> BuildRoot()
{
TreeViewItem<int> root = new(0, -1);
Expand Down Expand Up @@ -128,7 +128,7 @@ protected override TreeViewItem BuildRoot()
}
#endif

#if UNITY_6000_0_OR_NEWER
#if UNITY_6000_1_OR_NEWER
protected override bool CanMultiSelect(TreeViewItem<int> item)
#else
protected override bool CanMultiSelect(TreeViewItem item)
Expand All @@ -142,7 +142,7 @@ protected override void SelectionChanged(IList<int> selectedIds)
if (selectedIds.Count != 1)
return;

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

protected override void SingleClickedItem(int id)
{
#if UNITY_6000_0_OR_NEWER
#if UNITY_6000_1_OR_NEWER
TreeViewItem<int> item = FindItem(id, rootItem);
#else
TreeViewItem item = FindItem(id, rootItem);
Expand All @@ -170,7 +170,7 @@ protected override void SingleClickedItem(int id)

protected override void DoubleClickedItem(int id)
{
#if UNITY_6000_0_OR_NEWER
#if UNITY_6000_1_OR_NEWER
TreeViewItem<int> item = FindItem(id, rootItem);
#else
TreeViewItem item = FindItem(id, rootItem);
Expand All @@ -184,7 +184,7 @@ protected override void DoubleClickedItem(int id)

protected override void ContextClickedItem(int id)
{
#if UNITY_6000_0_OR_NEWER
#if UNITY_6000_1_OR_NEWER
TreeViewItem<int> item = FindItem(id, rootItem);
#else
TreeViewItem item = FindItem(id, rootItem);
Expand Down
2 changes: 1 addition & 1 deletion Scripts/Editor/Browser/BrowserTreeViewItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

namespace BrunoMikoski.ScriptableObjectCollections.Browser
{
#if UNITY_6000_0_OR_NEWER
#if UNITY_6000_1_OR_NEWER
public class BrowserTreeViewItem : TreeViewItem<int>
#else
public class BrowserTreeViewItem : TreeViewItem
Expand Down