griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Asset Browser: Nest all catalogs under the "All" item

Browse Source 
This makes the relation to the catalogs and the behavior more clear.

Part of T93582.
This commit is contained in:
Julian Eisel
2021-12-02 18:52:12 +01:00
parent 27b70428c1
commit e38532773b
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/editors/space_file/asset_catalog_tree_view.cc
View File

@@ -79,7 +79,7 @@ class AssetCatalogTreeView : public ui::AbstractTreeView {
ui::BasicTreeViewItem &build_catalog_items_recursive(ui::TreeViewItemContainer &view_parent_item,
AssetCatalogTreeItem &catalog);
void add_all_item();
AssetCatalogTreeViewAllItem &add_all_item();
void add_unassigned_item();
bool is_active_catalog(CatalogID catalog_id) const;
};
@@ -197,11 +197,12 @@ AssetCatalogTreeView::AssetCatalogTreeView(::AssetLibrary *library,
void AssetCatalogTreeView::build_tree()
{
add_all_item();
AssetCatalogTreeViewAllItem &all_item = add_all_item();
all_item.set_collapsed(false);
if (catalog_tree_) {
catalog_tree_->foreach_root_item([this](AssetCatalogTreeItem &item) {
ui::BasicTreeViewItem &child_view_item = build_catalog_items_recursive(*this, item);
catalog_tree_->foreach_root_item([this, &all_item](AssetCatalogTreeItem &item) {
ui::BasicTreeViewItem &child_view_item = build_catalog_items_recursive(all_item, item);
/* Open root-level items by default. */
child_view_item.set_collapsed(false);
@@ -225,7 +226,7 @@ ui::BasicTreeViewItem &AssetCatalogTreeView::build_catalog_items_recursive(
return view_item;
}
void AssetCatalogTreeView::add_all_item()
AssetCatalogTreeViewAllItem &AssetCatalogTreeView::add_all_item()
{
FileAssetSelectParams *params = params_;
@@ -237,6 +238,7 @@ void AssetCatalogTreeView::add_all_item()
});
item.set_is_active_fn(
[params]() { return params->asset_catalog_visibility == FILE_SHOW_ASSETS_ALL_CATALOGS; });
return item;
}
void AssetCatalogTreeView::add_unassigned_item()