Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-11-26 09:43:23 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-11-26 09:43:23 +0300
commit16c46aabadf7d23750c6967785c434553bfc9570 (patch)
tree898e3144a6652f00cbd5cdab3d18495d15e260cc /source/blender/editors/interface/interface_region_hud.c
parent59e8d532d9b928cd5f1a2dfe5d87b567c678e84c (diff)
Correct last commit
Initial display was fixed, broke refreshing.
Diffstat (limited to 'source/blender/editors/interface/interface_region_hud.c')
-rw-r--r--source/blender/editors/interface/interface_region_hud.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/source/blender/editors/interface/interface_region_hud.c b/source/blender/editors/interface/interface_region_hud.c
index f951e26b830..aacb688b841 100644
--- a/source/blender/editors/interface/interface_region_hud.c
+++ b/source/blender/editors/interface/interface_region_hud.c
@@ -294,8 +294,9 @@ void ED_area_type_hud_ensure(bContext *C, ScrArea *sa)
return;
}
- bool init = false;
ARegion *ar = BKE_area_find_region_type(sa, RGN_TYPE_HUD);
+ bool init = false;
+ bool was_hidden = ar == NULL || ar->visible == false;
if (!last_redo_poll(C)) {
if (ar) {
ED_region_tag_redraw(ar);
@@ -360,10 +361,12 @@ void ED_area_type_hud_ensure(bContext *C, ScrArea *sa)
if (ar->visible) {
ARegion *ar_prev = CTX_wm_region(C);
CTX_wm_region_set((bContext *)C, ar);
- ED_region_panels_layout(C, ar);
- ar->winx = ar->v2d.winx;
- ar->winy = ar->v2d.winy;
- ar->v2d.cur = ar->v2d.tot = (rctf){.xmax = ar->winx, .ymax = ar->winy};
+ hud_region_layout(C, ar);
+ if (was_hidden) {
+ ar->winx = ar->v2d.winx;
+ ar->winy = ar->v2d.winy;
+ ar->v2d.cur = ar->v2d.tot = (rctf){.xmax = ar->winx, .ymax = ar->winy};
+ }
CTX_wm_region_set((bContext *)C, ar_prev);
}
}