[Bf-blender-cvs] [2ae404252d3] blender2.8: UI: fix popover subpanel header display

[Campbell Barton]

Commit: 2ae404252d3996817f6034dd64eec0d140c4bac8
Author: Campbell Barton
Date:   Sat Jun 9 18:03:22 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB2ae404252d3996817f6034dd64eec0d140c4bac8

UI: fix popover subpanel header display

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

M	source/blender/editors/interface/interface_layout.c

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

diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c
index 73008aa11f6..685c81bd777 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -4258,6 +4258,7 @@ static void ui_paneltype_draw_impl(
 		if (pt->draw_header) {
 			panel->layout = uiLayoutRow(layout, false);
 			pt->draw_header(C, panel);
+			uiItemL(panel->layout, pt->label, ICON_NONE);
 			panel->layout = NULL;
 		}
 	}
@@ -4276,8 +4277,8 @@ static void ui_paneltype_draw_impl(
 		if (pt_iter != pt && STREQ(pt_iter->parent_id, pt->idname)) {
 			if (pt_iter->poll == NULL || pt_iter->poll(C, pt_iter)) {
 				uiItemS(layout);
-				uiItemL(layout, pt_iter->label, ICON_NONE);
-				ui_paneltype_draw_impl(C, pt_iter, layout, true);
+				uiLayout *col = uiLayoutColumn(layout, false);
+				ui_paneltype_draw_impl(C, pt_iter, col, true);
 			}
 		}
 	} while ((pt_iter = pt_iter->next));