diff options
| author | Ton Roosendaal <ton@blender.org> | 2009-06-26 16:55:46 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2009-06-26 16:55:46 +0400 |
| commit | 07e9c4ef2b221a245497d75336fd5ece12d98682 (patch) | |
| tree | 7d6b71a4e105d97eb6ff255374551a2ad00c02f8 /source/blender/editors | |
| parent | 4b914c7f75faa65a7d2a991b7904c18051d13a13 (diff) | |
2.5
Makes toolbar region in 3d editor work correctly overlapping, also
when area is subdivided in 4-split, and/or with properties region.
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/screen/area.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index 07d8fb370e6..535e99ccfef 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -259,14 +259,16 @@ static void region_scissor_winrct(ARegion *ar, rcti *winrct) while(ar->prev) { ar= ar->prev; - if(ar->flag & RGN_FLAG_HIDDEN); - else if(ar->alignment==RGN_OVERLAP_LEFT) { - winrct->xmin= ar->winrct.xmax + 1; - } - else if(ar->alignment==RGN_OVERLAP_RIGHT) { - winrct->xmax= ar->winrct.xmin - 1; + if(BLI_isect_rcti(winrct, &ar->winrct, NULL)) { + if(ar->flag & RGN_FLAG_HIDDEN); + else if(ar->alignment==RGN_OVERLAP_LEFT) { + winrct->xmin= ar->winrct.xmax + 1; + } + else if(ar->alignment==RGN_OVERLAP_RIGHT) { + winrct->xmax= ar->winrct.xmin - 1; + } + else break; } - else break; } } |