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/space_buttons.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/space_buttons.c')
| -rw-r--r-- | source/blender/editors/space_buttons/space_buttons.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/source/blender/editors/space_buttons/space_buttons.c b/source/blender/editors/space_buttons/space_buttons.c index 50018b212a6..413d0ab376a 100644 --- a/source/blender/editors/space_buttons/space_buttons.c +++ b/source/blender/editors/space_buttons/space_buttons.c @@ -358,6 +358,13 @@ static void buttons_keymap(struct wmKeyConfig *keyconf) /* add handlers, stuff you only do once or on area/region changes */ static void buttons_header_region_init(wmWindowManager *UNUSED(wm), ARegion *ar) { +#ifdef USE_HEADER_CONTEXT_PATH + /* Reinsert context buttons header-type at the end of the list so it's drawn last. */ + HeaderType *context_ht = BLI_findstring(&ar->type->headertypes, "BUTTONS_HT_context", offsetof(HeaderType, idname)); + BLI_remlink(&ar->type->headertypes, context_ht); + BLI_addtail(&ar->type->headertypes, context_ht); +#endif + ED_region_header_init(ar); } @@ -395,6 +402,10 @@ static void buttons_header_region_message_subscribe( if (sbuts->mainb == BCONTEXT_TOOL) { WM_msg_subscribe_rna_anon_prop(mbus, WorkSpace, tools, &msg_sub_value_region_tag_redraw); } + +#ifdef USE_HEADER_CONTEXT_PATH + WM_msg_subscribe_rna_anon_prop(mbus, SpaceProperties, context, &msg_sub_value_region_tag_redraw); +#endif } static void buttons_navigation_bar_region_init(wmWindowManager *wm, ARegion *ar) @@ -687,9 +698,10 @@ void ED_spacetype_buttons(void) art->draw = ED_region_panels_draw; art->listener = buttons_main_region_listener; art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_FRAMES; - BLI_addhead(&st->regiontypes, art); - +#ifndef USE_HEADER_CONTEXT_PATH buttons_context_register(art); +#endif + BLI_addhead(&st->regiontypes, art); /* regions: header */ art = MEM_callocN(sizeof(ARegionType), "spacetype buttons region"); @@ -700,6 +712,9 @@ void ED_spacetype_buttons(void) art->init = buttons_header_region_init; art->draw = buttons_header_region_draw; art->message_subscribe = buttons_header_region_message_subscribe; +#ifdef USE_HEADER_CONTEXT_PATH + buttons_context_register(art); +#endif BLI_addhead(&st->regiontypes, art); /* regions: navigation bar */ |