From 2fa23a05941c652228d76c36e8f4d7e927538c8d Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Fri, 12 Dec 2008 16:29:33 +0000 Subject: 2.5 Fixes in view2d: - mask/slider rects were calculated wrong 1 pixel (was overlapping) - found bug with outliner stretching on area-edge-dragging. It required an extra mapping of the 'cur view' via mask to actual region. - added v2d sanity check for uninitialized v2d's - removed cruft in do_versions for headers (gets catched with above) - added header-view2d-initialize function, for new-space calls Fixes in areamanager: - fixes in 'new space' for time/outliner/view2d (unfinished) For Joshua: - Making time window higher shows it doesn't update 'cur'. Not sure what kind of v2d flag should be checked or set? --- source/blender/editors/screen/area.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'source/blender/editors/screen') diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index 14a7b51c03d..73ff3e9fe05 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -229,12 +229,12 @@ static void region_rect_recursive(ARegion *ar, rcti *remainder) ar->winrct= *remainder; if(ar->alignment==RGN_ALIGN_TOP) { - ar->winrct.ymin= ar->winrct.ymax - prefsizey; - remainder->ymax= ar->winrct.ymin-1; + ar->winrct.ymin= ar->winrct.ymax - prefsizey + 1; + remainder->ymax= ar->winrct.ymin - 1; } else { - ar->winrct.ymax= ar->winrct.ymin + prefsizey; - remainder->ymin= ar->winrct.ymax+1; + ar->winrct.ymax= ar->winrct.ymin + prefsizey - 1; + remainder->ymin= ar->winrct.ymax + 1; } } } @@ -252,12 +252,12 @@ static void region_rect_recursive(ARegion *ar, rcti *remainder) ar->winrct= *remainder; if(ar->alignment==RGN_ALIGN_RIGHT) { - ar->winrct.xmin= ar->winrct.xmax - prefsizex; - remainder->xmax= ar->winrct.xmin-1; + ar->winrct.xmin= ar->winrct.xmax - prefsizex + 1; + remainder->xmax= ar->winrct.xmin - 1; } else { - ar->winrct.xmax= ar->winrct.xmin + prefsizex; - remainder->xmin= ar->winrct.xmax+1; + ar->winrct.xmax= ar->winrct.xmin + prefsizex - 1; + remainder->xmin= ar->winrct.xmax + 1; } } } @@ -545,8 +545,8 @@ void ED_newspace(ScrArea *sa, int type) sl->regionbase.first= sl->regionbase.last= NULL; } } + } - } -- cgit v1.2.3