diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-05-06 17:07:34 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-05-06 17:08:12 +0300 |
| commit | bb3a030306a275bfb7ac3100103f7ed9fa9ad8c8 (patch) | |
| tree | 5c122b3569472473fea8d06067d46bbbfa0700d7 /source/blender/editors/screen/area.c | |
| parent | 541258bfa60e90ff6c0b89ed2972963a9f53db86 (diff) | |
Fix issue with hidden headers after previous commit.
Diffstat (limited to 'source/blender/editors/screen/area.c')
| -rw-r--r-- | source/blender/editors/screen/area.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index f8482eba67e..611e5fdd636 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -1114,6 +1114,10 @@ static void region_overlap_fix(ScrArea *sa, ARegion *ar) /* find overlapping previous region on same place */ for (ar1 = ar->prev; ar1; ar1 = ar1->prev) { + if (ar1->flag & (RGN_FLAG_HIDDEN)) { + continue; + } + if (ar1->overlap && ((ar1->alignment & RGN_SPLIT_PREV) == 0)) { align1 = ar1->alignment; if (BLI_rcti_isect(&ar1->winrct, &ar->winrct, NULL)) { @@ -1153,6 +1157,10 @@ static void region_overlap_fix(ScrArea *sa, ARegion *ar) /* At this point, 'ar' is in its final position and still open. * Make a final check it does not overlap any previous 'other side' region. */ for (ar1 = ar->prev; ar1; ar1 = ar1->prev) { + if (ar1->flag & (RGN_FLAG_HIDDEN)) { + continue; + } + if (ar1->overlap && (ar1->alignment & RGN_SPLIT_PREV) == 0) { if ((ar1->alignment != align) && BLI_rcti_isect(&ar1->winrct, &ar->winrct, NULL)) { /* Left overlapping right or vice-versa, forbid this! */ |