griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

2.5

Browse Source 
Makes toolbar region in 3d editor work correctly overlapping, also
when area is subdivided in 4-split, and/or with properties region.
This commit is contained in:
Ton Roosendaal
2009-06-26 12:55:46 +00:00
parent 4b914c7f75
commit 07e9c4ef2b
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/editors/screen/area.c
View File

@@ -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;
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 if(ar->alignment==RGN_OVERLAP_RIGHT) {
winrct->xmax= ar->winrct.xmin - 1;
}
else break;
}
}