diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-07-10 13:43:10 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-07-10 17:30:17 +0300 |
| commit | 0a04314d0669bfd3b63fca75474e7fb9749fe8f1 (patch) | |
| tree | 108dbf043a10a87bb272a57fdb76e028449673f8 /source/blender/editors/interface | |
| parent | 1a43e081873415754950766edaddad220adf67bc (diff) | |
Fix popovers showing unnecessary titles.
Diffstat (limited to 'source/blender/editors/interface')
| -rw-r--r-- | source/blender/editors/interface/interface_layout.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c index 159e8b1d022..16016a799ef 100644 --- a/source/blender/editors/interface/interface_layout.c +++ b/source/blender/editors/interface/interface_layout.c @@ -4326,7 +4326,7 @@ void UI_menutype_draw(bContext *C, MenuType *mt, struct uiLayout *layout) static void ui_paneltype_draw_impl( - bContext *C, PanelType *pt, uiLayout *layout) + bContext *C, PanelType *pt, uiLayout *layout, bool show_header) { Panel *panel = MEM_callocN(sizeof(Panel), "popover panel"); panel->type = pt; @@ -4335,13 +4335,15 @@ static void ui_paneltype_draw_impl( uiLayout *last_item = layout->items.last; /* Draw main panel. */ - uiLayout *row = uiLayoutRow(layout, false); - if (pt->draw_header) { - panel->layout = row; - pt->draw_header(C, panel); - panel->layout = NULL; + if (show_header) { + uiLayout *row = uiLayoutRow(layout, false); + if (pt->draw_header) { + panel->layout = row; + pt->draw_header(C, panel); + panel->layout = NULL; + } + uiItemL(row, pt->label, ICON_NONE); } - uiItemL(row, pt->label, ICON_NONE); panel->layout = layout; pt->draw(C, panel); @@ -4361,7 +4363,7 @@ static void ui_paneltype_draw_impl( } uiLayout *col = uiLayoutColumn(layout, false); - ui_paneltype_draw_impl(C, child_pt, col); + ui_paneltype_draw_impl(C, child_pt, col, true); } } } @@ -4375,7 +4377,7 @@ void UI_paneltype_draw(bContext *C, PanelType *pt, uiLayout *layout) CTX_store_set(C, layout->context); } - ui_paneltype_draw_impl(C, pt, layout); + ui_paneltype_draw_impl(C, pt, layout, false); if (layout->context) { CTX_store_set(C, NULL); |