diff options
author | Julian Eisel <eiseljulian@gmail.com> | 2018-10-30 00:55:54 +0300 |
---|---|---|
committer | Julian Eisel <eiseljulian@gmail.com> | 2018-10-30 00:59:57 +0300 |
commit | a0d40c6a8c42c774d9286b5de0d80167c1d55fde (patch) | |
tree | 9f5bfb8c74e789a277a0ed1fea031728d9702a4c /source/blender/editors/space_buttons/buttons_context.c | |
parent | 39a1d4527950fe32b9a421ce366b012a5fe1fa79 (diff) |
UI: Move Properties editor context path into header
This will probably be a temporary solution to fill empty space, for until we
have a search button there. Hence, I made this optional using a compile flag.
Diffstat (limited to 'source/blender/editors/space_buttons/buttons_context.c')
-rw-r--r-- | source/blender/editors/space_buttons/buttons_context.c | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c index 04948fd6984..abc2ed6ca3c 100644 --- a/source/blender/editors/space_buttons/buttons_context.c +++ b/source/blender/editors/space_buttons/buttons_context.c @@ -1049,19 +1049,38 @@ void buttons_context_draw(const bContext *C, uiLayout *layout) } } +#ifdef USE_HEADER_CONTEXT_PATH +static bool buttons_header_context_poll(const bContext *C, HeaderType *UNUSED(ht)) +#else static bool buttons_panel_context_poll(const bContext *C, PanelType *UNUSED(pt)) +#endif { SpaceButs *sbuts = CTX_wm_space_buts(C); return (sbuts->mainb != BCONTEXT_TOOL); } -static void buttons_panel_context_draw(const bContext *C, Panel *pa) +#ifdef USE_HEADER_CONTEXT_PATH +static void buttons_header_context_draw(const bContext *C, Header *ptr) +#else +static void buttons_panel_context_draw(const bContext *C, Panel *ptr) +#endif { - buttons_context_draw(C, pa->layout); + buttons_context_draw(C, ptr->layout); } void buttons_context_register(ARegionType *art) { +#ifdef USE_HEADER_CONTEXT_PATH + HeaderType *ht; + + ht = MEM_callocN(sizeof(HeaderType), "spacetype buttons context header"); + strcpy(ht->idname, "BUTTONS_HT_context"); + ht->space_type = SPACE_BUTS; + ht->region_type = art->regionid; + ht->poll = buttons_header_context_poll; + ht->draw = buttons_header_context_draw; + BLI_addtail(&art->headertypes, ht); +#else PanelType *pt; pt = MEM_callocN(sizeof(PanelType), "spacetype buttons panel context"); @@ -1072,6 +1091,7 @@ void buttons_context_register(ARegionType *art) pt->draw = buttons_panel_context_draw; pt->flag = PNL_NO_HEADER; BLI_addtail(&art->paneltypes, pt); +#endif } ID *buttons_context_id_path(const bContext *C) |