diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-12 17:49:52 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-12 17:50:27 +0300 |
commit | 2a3e7fe656e7a9d84b308439598cf9de53d78fff (patch) | |
tree | 04ebb71e829e0c734f44435805dfeaffb4f53300 /source/blender/editors/interface/interface_region_hud.c | |
parent | deb3d73eea3098c2222eeeca9926759f3ec86784 (diff) |
UI: improve HUD ensure/clear logic
Running operators w/o redo now clears the HUD immediately.
Diffstat (limited to 'source/blender/editors/interface/interface_region_hud.c')
-rw-r--r-- | source/blender/editors/interface/interface_region_hud.c | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/source/blender/editors/interface/interface_region_hud.c b/source/blender/editors/interface/interface_region_hud.c index ad779d2580f..5a3d2250f20 100644 --- a/source/blender/editors/interface/interface_region_hud.c +++ b/source/blender/editors/interface/interface_region_hud.c @@ -210,27 +210,30 @@ static ARegion *hud_region_add(ScrArea *sa) return ar; } -void ED_area_type_hud_ensure(bContext *C, ScrArea *sa) +void ED_area_type_hud_clear(wmWindowManager *wm, ScrArea *sa_keep) { - /* We only want one at a time. */ - Main *bmain = CTX_data_main(C); - for (wmWindowManager *wm = bmain->wm.first; wm; wm = wm->id.next) { - for (wmWindow *win = wm->windows.first; win; win = win->next) { - bScreen *screen = WM_window_get_active_screen(win); - for (ScrArea *sa_iter = screen->areabase.first; sa_iter; sa_iter = sa_iter->next) { - if (sa != sa_iter) { - for (ARegion *ar = sa_iter->regionbase.first; ar; ar = ar->next) { - if (ar->regiontype == RGN_TYPE_HUD) { - if ((ar->flag & RGN_FLAG_HIDDEN) == 0) { - ar->flag |= RGN_FLAG_HIDDEN; - ED_region_tag_redraw(ar); - } + for (wmWindow *win = wm->windows.first; win; win = win->next) { + bScreen *screen = WM_window_get_active_screen(win); + for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) { + if (sa != sa_keep) { + for (ARegion *ar = sa->regionbase.first; ar; ar = ar->next) { + if (ar->regiontype == RGN_TYPE_HUD) { + if ((ar->flag & RGN_FLAG_HIDDEN) == 0) { + ar->flag |= RGN_FLAG_HIDDEN; + ED_region_tag_redraw(ar); + ED_area_tag_redraw(sa); } } } } } } +} + +void ED_area_type_hud_ensure(bContext *C, ScrArea *sa) +{ + wmWindowManager *wm = CTX_wm_manager(C); + ED_area_type_hud_clear(wm, sa); ARegionType *art = BKE_regiontype_from_id(sa->type, RGN_TYPE_HUD); if (art == NULL) { @@ -241,6 +244,7 @@ void ED_area_type_hud_ensure(bContext *C, ScrArea *sa) ARegion *ar = BKE_area_find_region_type(sa, RGN_TYPE_HUD); if (!last_redo_poll(C)) { if (ar) { + ED_region_tag_redraw(ar); ar->flag |= RGN_FLAG_HIDDEN; } return; |