[Bf-blender-cvs] [93bdb0a20fe] temp-asset-browser-catalogs-ui: Remove margin around tree-view items

[Julian Eisel]

Commit: 93bdb0a20fe13d608622da1f83c66b5858b1cfe3
Author: Julian Eisel
Date:   Tue Sep 7 15:12:42 2021 +0200
Branches: temp-asset-browser-catalogs-ui
https://developer.blender.org/rB93bdb0a20fe13d608622da1f83c66b5858b1cfe3

Remove margin around tree-view items

===================================================================

M	source/blender/editors/include/UI_tree_view.hh
M	source/blender/editors/interface/tree_view.cc

===================================================================

diff --git a/source/blender/editors/include/UI_tree_view.hh b/source/blender/editors/include/UI_tree_view.hh
index 1aacc7081e0..d715f58a52b 100644
--- a/source/blender/editors/include/UI_tree_view.hh
+++ b/source/blender/editors/include/UI_tree_view.hh
@@ -93,6 +93,8 @@ class uiTreeViewLayoutBuilder {
   uiTreeViewLayoutBuilder(uiBlock &);
 
   void build_row(uiAbstractTreeViewItem &item) const;
+  uiBlock &block() const;
+  uiLayout *current_layout() const;
 };
 
 class uiAbstractTreeView : public uiTreeViewItemContainer {
diff --git a/source/blender/editors/interface/tree_view.cc b/source/blender/editors/interface/tree_view.cc
index 7ae015e21c5..4c9232a21b4 100644
--- a/source/blender/editors/interface/tree_view.cc
+++ b/source/blender/editors/interface/tree_view.cc
@@ -59,7 +59,13 @@ uiAbstractTreeViewItem &uiTreeViewItemContainer::add_tree_item(
 
 void uiAbstractTreeView::build_layout_from_tree(const uiTreeViewLayoutBuilder &builder)
 {
+  uiLayout *prev_layout = builder.current_layout();
+
+  uiLayoutColumn(prev_layout, true);
+
   build_layout_from_tree_recursive(builder, *this);
+
+  UI_block_layout_set_current(&builder.block(), prev_layout);
 }
 
 void uiAbstractTreeView::build_layout_from_tree_recursive(const uiTreeViewLayoutBuilder &builder,
@@ -102,15 +108,24 @@ uiTreeViewLayoutBuilder::uiTreeViewLayoutBuilder(uiBlock &block) : block_(block)
 
 void uiTreeViewLayoutBuilder::build_row(uiAbstractTreeViewItem &item) const
 {
-  uiLayout *prev_layout = block_.curlayout;
-
-  uiLayout *row = uiLayoutRow(block_.curlayout, false);
+  uiLayout *prev_layout = current_layout();
+  uiLayout *row = uiLayoutRow(prev_layout, false);
 
   item.build_row(*row);
 
   UI_block_layout_set_current(&block_, prev_layout);
 }
 
+uiBlock &uiTreeViewLayoutBuilder::block() const
+{
+  return block_;
+}
+
+uiLayout *uiTreeViewLayoutBuilder::current_layout() const
+{
+  return block_.curlayout;
+}
+
 /* ---------------------------------------------------------------------- */
 
 uiBasicTreeViewItem::uiBasicTreeViewItem(StringRef label_, BIFIconID icon_)