blender
/
blender
137
416
Fork 599
Code Issues 6.3k Pull Requests 778 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 - +18 -26
3 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 486ff75da7 - Show all commits

31
source/blender/editors/asset/intern/asset_shelf.cc
View File

@ -107,17 +107,13 @@ void ED_asset_shelf_region_init(wmWindowManager *wm, ARegion *region)
region->v2d.page_size_y = ED_asset_shelf_default_tile_height();
}
static constexpr int main_region_padding_y_not_scaled()
static int main_region_padding_y()
{
return 2;
const uiStyle *style = UI_style_get_dpi();
return style->buttonspacey / 2;
}
static int main_region_padding_y_scaled()
{
return main_region_padding_y_not_scaled() * UI_SCALE_FAC;
}
static int main_region_padding_x_scaled()
static int main_region_padding_x()
{
const uiStyle *style = UI_style_get_dpi();
return style->buttonspacex;
@ -132,9 +128,12 @@ int ED_asset_shelf_region_snap(const ARegion *region, const int size, const int
const int size_scaled = size * UI_SCALE_FAC;
const float tile_height = ED_asset_shelf_default_tile_height() *
UI_view2d_scale_get_y(&region->v2d);
const int region_padding = main_region_padding_y_scaled();
const float aspect = BLI_rctf_size_y(&region->v2d.cur) /
(BLI_rcti_size_y(&region->v2d.mask) + 1);
const float tile_height = ED_asset_shelf_default_tile_height() /
(IS_EQF(aspect, 0) ? 1.0f : aspect);
const int region_padding = main_region_padding_y();
/* How many rows fit into the region (accounting for padding). */
const int rows = std::max(1, int((size_scaled - 2 * region_padding) / tile_height));
@ -155,10 +154,8 @@ int ED_asset_shelf_default_tile_height()
int ED_asset_shelf_region_prefsizey()
{
/* Can't account for DPI here since this is expected to be called on region type initialization
* at startup, when #U isn't available yet. */
return ED_asset_shelf_default_tile_width() + 2 * main_region_padding_y_not_scaled();
/* One row by default (plus padding). */
return ED_asset_shelf_default_tile_height() + 2 * main_region_padding_y();
}
/**
@ -186,8 +183,8 @@ void ED_asset_shelf_region_draw(const bContext *C,
uiBlock *block = UI_block_begin(C, region, __func__, UI_EMBOSS);
const uiStyle *style = UI_style_get();
const float padding_y = main_region_padding_y_scaled();
const float padding_x = main_region_padding_x_scaled();
const float padding_y = main_region_padding_y();
const float padding_x = main_region_padding_x();
const float scale_x = UI_view2d_scale_get_x(&region->v2d);
uiLayout *layout = UI_block_layout(block,
UI_LAYOUT_VERTICAL,

12
source/blender/editors/screen/area.cc
View File

@ -1313,14 +1313,6 @@ static void region_rect_recursive(
}
}
if (region->flag & RGN_FLAG_HIDDEN) {
/* Pass. */
}
else if (const int snap_flags = ED_region_snap_size_test(region)) {
/* Apply snapping, which updates #ARegion.sizex/sizey values. */
ED_region_snap_size_apply(region, snap_flags);
}
/* `prefsizex/y`, taking into account DPI. */
int prefsizex = UI_SCALE_FAC *
((region->sizex > 1) ? region->sizex + 0.5f : region->type->prefsizex);
@ -1339,6 +1331,10 @@ static void region_rect_recursive(
else if (region->regiontype == RGN_TYPE_FOOTER) {
prefsizey = ED_area_footersize();
}
else if (region->regiontype == RGN_TYPE_ASSET_SHELF) {
prefsizey = region->sizey > 1 ? (UI_SCALE_FAC * (region->sizey + 0.5f)) :
ED_asset_shelf_region_prefsizey();
}
else if (region->regiontype == RGN_TYPE_ASSET_SHELF_FOOTER) {
prefsizey = ED_asset_shelf_footer_size();
}

1
source/blender/editors/space_view3d/space_view3d.cc
View File

@ -2253,7 +2253,6 @@ void ED_spacetype_view3d()
/* regions: asset shelf */
art = MEM_cnew<ARegionType>("spacetype view3d asset shelf region");
art->regionid = RGN_TYPE_ASSET_SHELF;
art->prefsizey = ED_asset_shelf_region_prefsizey();
art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_ASSET_SHELF | ED_KEYMAP_FRAMES;
art->listener = ED_asset_shelf_region_listen;
art->poll = ED_asset_shelf_poll;