blender
/
blender
137
416
Fork 599
Code Issues 6.3k Pull Requests 775 Projects 19 Wiki Activity

UI: Asset Shelf (Experimental Feature) #104831

Closed
Julian Eisel wants to merge 399 commits from asset-shelf into main
pull from: asset-shelf
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 30 Commits 399 Files Changed - +9 -16
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 040ecfa45f - Show all commits

25
source/blender/editors/interface/views/grid_view.cc
View File

@ -334,6 +334,7 @@ void GridViewLayoutBuilder::build_grid_tile(uiLayout &grid_layout,
AbstractGridViewItem &item) const
{
uiLayout *overlap = uiLayoutOverlap(&grid_layout);
uiLayoutSetFixedSize(overlap, true);
item.add_grid_tile_button(block_);
item.build_grid_tile(*uiLayoutRow(overlap, false));
@ -344,7 +345,7 @@ void GridViewLayoutBuilder::build_from_view(const AbstractGridView &grid_view,
{
uiLayout *parent_layout = current_layout();
uiLayout &layout = *uiLayoutColumn(current_layout(), false);
uiLayout &layout = *uiLayoutColumn(current_layout(), true);
const GridViewStyle &style = grid_view.get_style();
const int cols_per_row = std::max(uiLayoutGetWidth(&layout) / style.tile_width, 1);
@ -353,12 +354,8 @@ void GridViewLayoutBuilder::build_from_view(const AbstractGridView &grid_view,
build_visible_helper.fill_layout_before_visible(block_);
/* Use `-cols_per_row` because the grid layout uses a multiple of the passed absolute value for
* the number of columns then, rather than distributing the number of items evenly over rows and
* stretching the items to fit (see #uiLayoutItemGridFlow.columns_len). */
uiLayout *grid_layout = uiLayoutGridFlow(&layout, true, -cols_per_row, true, true, true);
int item_idx = 0;
uiLayout *row = nullptr;
grid_view.foreach_item([&](AbstractGridViewItem &item) {
/* Skip if item isn't visible. */
if (!build_visible_helper.is_item_visible(item_idx)) {
@ -366,19 +363,15 @@ void GridViewLayoutBuilder::build_from_view(const AbstractGridView &grid_view,
return;
}
build_grid_tile(*grid_layout, item);
/* Start a new row for every first item in the row. */
if ((item_idx % cols_per_row) == 0) {
row = uiLayoutRow(&layout, true);
}
build_grid_tile(*row, item);
item_idx++;
});
/* If there are not enough items to fill the layout, add padding items so the layout doesn't
* stretch over the entire width. */
if (grid_view.get_item_count() < cols_per_row) {
for (int padding_item_idx = 0; padding_item_idx < (cols_per_row - grid_view.get_item_count());
padding_item_idx++) {
uiItemS(grid_layout);
}
}
UI_block_layout_set_current(&block_, parent_layout);
build_visible_helper.fill_layout_after_visible(block_);