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

Bugfix #7294:

Browse Source 
When resizing an Outliner window, the contents would eventually get 'pushed out of view' when shrinking the view. 

I've added a bit of a 'hack', which will ensure that this doesn't happen, by forcing the view to look at the left-side of the outliner tree, when the width of the outliner window decreses due to resizing.
This commit is contained in:
Joshua Leung
2007-09-10 07:24:26 +00:00
parent 90e7bcdc29
commit 5cc36bd0da
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
source/blender/src/drawipo.c
View File

@@ -614,17 +614,23 @@ void test_view2d(View2D *v2d, int winx, int winy)
else if( dy > 1.0) do_x= 0; else do_x= 1;
}
v2d->oldwinx= winx;
v2d->oldwiny= winy;
if( do_x ) {
/* portrait window: correct for x */
dx= cur->ymax-cur->ymin;
temp= (cur->xmax+cur->xmin);
cur->xmin= temp/2.0 - 0.5*dx/dy;
cur->xmax= temp/2.0 + 0.5*dx/dy;
if (v2d->keeptot == 2 && winx < v2d->oldwinx) {
/* This is a special hack for the outliner, to ensure that the
* outliner contents will not eventually get pushed out of view
* when shrinking the view.
*/
cur->xmax -= cur->xmin;
cur->xmin= 0.0f;
}
else {
/* portrait window: correct for x */
dx= cur->ymax-cur->ymin;
temp= (cur->xmax+cur->xmin);
cur->xmin= temp/2.0 - 0.5*dx/dy;
cur->xmax= temp/2.0 + 0.5*dx/dy;
}
}
else {
dx= cur->xmax-cur->xmin;
@@ -633,6 +639,9 @@ void test_view2d(View2D *v2d, int winx, int winy)
cur->ymin= temp/2.0 - 0.5*dy*dx;
cur->ymax= temp/2.0 + 0.5*dy*dx;
}
v2d->oldwinx= winx;
v2d->oldwiny= winy;
}
if(v2d->keeptot) {
@@ -664,6 +673,7 @@ void test_view2d(View2D *v2d, int winx, int winy)
cur->xmax+= dx;
}
else if((v2d->keeptot!=2) && (cur->xmax > tot->xmax)) {
/* keeptot==2 is a special case for the outliner. see space.c, init_v2d_oops for details */
dx= cur->xmax-tot->xmax;
cur->xmin-= dx;
cur->xmax-= dx;