Skip to content

Commit

Permalink
Merge pull request Unity-Technologies#20 from unity/Multi-Select
Browse files Browse the repository at this point in the history
List Multiselect interface implementation
  • Loading branch information
mtschoen-unity authored and GitHub Enterprise committed Sep 11, 2020
2 parents 567341c + 44e7f03 commit d50be17
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 2 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ All notable changes to this package will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [0.4.12-preview] - 1212-12-12
## [0.4.12-preview] - 2020-09-11
- Update List View Framework with multi-select changes

## [0.4.11-preview] - 2020-09-02
- Update List View Framework dependency version
Expand Down
2 changes: 2 additions & 0 deletions Runtime/Scripts/Data/AssetData.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ sealed class AssetData : IListViewItemData<int>
public string type { get; private set; }
public GameObject preview { get; set; }

public bool selected => false;

public Object asset
{
get { return m_Asset; }
Expand Down
1 change: 1 addition & 0 deletions Runtime/Workspaces/PolyWorkspace/Scripts/PolyGridAsset.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ class PolyGridAsset : IListViewItemData<string>, IUsesWeb
public string template { get { return k_TemplateName; } }

public string index { get; private set; }
public bool selected => false;
public PolyAsset asset { get { return m_Asset; } }
public GameObject prefab { get { return m_Prefab; } }
public Texture2D thumbnail { get { return m_Thumbnail; } }
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"dependencies": {
"com.unity.xrtools.utils": "1.1.1",
"com.unity.xrtools.module-loader": "1.1.1",
"com.unity.list-view-framework": "1.1.4-preview",
"com.unity.list-view-framework": "1.1.5-preview",
"com.unity.xrtools.spatial-hash": "0.1.3-preview",
"com.unity.xr.legacyinputhelpers": "2.0.6",
"com.unity.xr-line-renderer": "0.1.2-preview",
Expand Down

0 comments on commit d50be17

Please sign in to comment.