diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-14 23:32:01 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-14 23:32:01 +0300 |
commit | 928d31d94a49f0b2644e7345ac58264c75db94f7 (patch) | |
tree | 9fac49d0ea82309076a5bcc3fba4a0ac7a1cf8d2 /source/blender/editors/interface | |
parent | 26786a2b87a08e239b7f255dc987ab70086bece0 (diff) |
WM: fix redo region setting the context
Diffstat (limited to 'source/blender/editors/interface')
-rw-r--r-- | source/blender/editors/interface/interface_region_hud.c | 43 |
1 files changed, 42 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_region_hud.c b/source/blender/editors/interface/interface_region_hud.c index ec5e7e5a011..569f50a9c75 100644 --- a/source/blender/editors/interface/interface_region_hud.c +++ b/source/blender/editors/interface/interface_region_hud.c @@ -133,15 +133,39 @@ static void hud_panels_register(ARegionType *art, int space_type, int region_typ /** \name Callbacks for Floating Region * \{ */ +struct HudRegionData { + short regionid; +}; + static void hud_region_init(wmWindowManager *wm, ARegion *ar) { ED_region_panels_init(wm, ar); UI_region_handlers_add(&ar->handlers); + ar->flag |= RGN_FLAG_TEMP_REGIONDATA; +} + +static void hud_region_free(ARegion *ar) +{ + MEM_SAFE_FREE(ar->regiondata); } static void hud_region_layout(const bContext *C, ARegion *ar) { - if (!last_redo_poll(C)) { + bool ok = false; + + { + struct HudRegionData *hrd = ar->regiondata; + if (hrd != NULL) { + ScrArea *sa = CTX_wm_area(C); + ARegion *ar_op = (hrd->regionid != -1) ? BKE_area_find_region_type(sa, hrd->regionid) : NULL; + ARegion *ar_prev = CTX_wm_region(C); + CTX_wm_region_set((bContext *)C, ar_op); + ok = last_redo_poll(C); + CTX_wm_region_set((bContext *)C, ar_prev); + } + } + + if (!ok) { ED_region_tag_redraw(ar); ar->flag |= RGN_FLAG_HIDDEN; return; @@ -192,6 +216,7 @@ ARegionType *ED_area_type_hud(int space_type) art->layout = hud_region_layout; art->draw = hud_region_draw; art->init = hud_region_init; + art->free = hud_region_free; hud_panels_register(art, space_type, art->regionid); @@ -283,6 +308,22 @@ void ED_area_type_hud_ensure(bContext *C, ScrArea *sa) ar->flag &= ~RGN_FLAG_HIDDEN; } + { + ARegion *ar_op = CTX_wm_region(C); + BLI_assert((ar_op == NULL) || (ar_op->regiontype != RGN_TYPE_HUD)); + struct HudRegionData *hrd = ar->regiondata; + if (hrd == NULL) { + hrd = MEM_callocN(sizeof(*hrd), __func__); + ar->regiondata = hrd; + } + if (ar_op) { + hrd->regionid = ar_op->regiontype; + } + else { + hrd->regionid = -1; + } + } + /* XXX, should be handled in more general way. */ ar->visible = !((ar->flag & RGN_FLAG_HIDDEN) || (ar->flag & RGN_FLAG_TOO_SMALL)); |