blender
/
blender
136
408
Fork 592
Code Issues 6.3k Pull Requests 775 Projects 19 Wiki Activity

UI: TreeView Hierarchy Line with Region Zoom #117420

Merged
Harley Acheson merged 4 commits from Harley/blender:TreeViewLines into main 2024-01-23 20:39:24 +01:00
Conversation 1 Commits 4 Files Changed 2 +14 -8
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/include/UI_tree_view.hh
View File

@ -150,7 +150,9 @@ class AbstractTreeView : public AbstractView, public TreeViewItemContainer {
void draw_hierarchy_lines(const ARegion &region) const;
void draw_hierarchy_lines_recursive(const ARegion &region,
const TreeViewOrItem &parent,
uint pos) const;
const uint pos,
const float aspect) const;
AbstractTreeViewItem *find_last_visible_descendant(const AbstractTreeViewItem &parent) const;
};

18
source/blender/editors/interface/views/tree_view.cc
View File

@ -135,14 +135,15 @@ AbstractTreeViewItem *AbstractTreeView::find_last_visible_descendant(
void AbstractTreeView::draw_hierarchy_lines_recursive(const ARegion &region,
const TreeViewOrItem &parent,
const uint pos) const
const uint pos,
const float aspect) const
{
for (const auto &item : parent.children_) {
if (!item->is_collapsible() || item->is_collapsed()) {
continue;
}
draw_hierarchy_lines_recursive(region, *item, pos);
draw_hierarchy_lines_recursive(region, *item, pos, aspect);
const AbstractTreeViewItem *first_descendant = item->children_.first().get();
const AbstractTreeViewItem *last_descendant = find_last_visible_descendant(*item);
@ -162,9 +163,10 @@ void AbstractTreeView::draw_hierarchy_lines_recursive(const ARegion &region,
ui_but_to_pixelrect(&last_child_rect, &region, block, &last_child_but);
/* Small vertical padding. */
const short line_padding = UI_UNIT_Y / 4.0f;
const float x = first_child_rect.xmin + first_descendant->indent_width() -
UI_ICON_SIZE * 0.5f + 2 * UI_SCALE_FAC;
const short line_padding = UI_UNIT_Y / 4.0f / aspect;
const float x = first_child_rect.xmin + ((first_descendant->indent_width() -
(0.5f * UI_ICON_SIZE) + U.pixelsize + UI_SCALE_FAC) /
Harley marked this conversation as resolved Outdated
Julian Eisel commented 2024-01-23 17:27:24 +01:00
Outdated
Review
Copy Link

Why is this not using UI_ICON_SIZE anymore? Now the position seems rather arbitrary, before it was more clear that it's centered horizontally under the icon. In general such arbitrary factors should be avoided since they say nothing, positioning should be based on known/named dimensions so intended visual relations are clear in code.

Why is this not using `UI_ICON_SIZE` anymore? Now the position seems rather arbitrary, before it was more clear that it's centered horizontally under the icon. In general such arbitrary factors should be avoided since they say nothing, positioning should be based on known/named dimensions so intended visual relations are clear in code.
Harley Acheson commented 2024-01-23 18:38:43 +01:00
Outdated
Review
Copy Link

No worries, changed to be based on half the icon width and line width nudges.

No worries, changed to be based on half the icon width and line width nudges.
aspect);
immBegin(GPU_PRIM_LINES, 2);
immVertex2f(pos, x, first_child_rect.ymax - line_padding);
immVertex2f(pos, x, last_child_rect.ymin + line_padding);
@ -174,6 +176,8 @@ void AbstractTreeView::draw_hierarchy_lines_recursive(const ARegion &region,
void AbstractTreeView::draw_hierarchy_lines(const ARegion &region) const
{
const float aspect = BLI_rctf_size_y(&region.v2d.cur) / (BLI_rcti_size_y(&region.v2d.mask) + 1);
GPUVertFormat *format = immVertexFormat();
uint pos = GPU_vertformat_attr_add(format, "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
uchar col[4];
@ -191,9 +195,9 @@ void AbstractTreeView::draw_hierarchy_lines(const ARegion &region) const
col[3] = 255;
immUniformColor4ubv(col);
GPU_line_width(1.0f);
GPU_line_width(1.0f / aspect);
GPU_blend(GPU_BLEND_ALPHA);
draw_hierarchy_lines_recursive(region, *this, pos);
draw_hierarchy_lines_recursive(region, *this, pos, aspect);
GPU_blend(GPU_BLEND_NONE);
immUnbindProgram();