Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2008-12-12 19:29:33 +0300
committerTon Roosendaal <ton@blender.org>2008-12-12 19:29:33 +0300
commit2fa23a05941c652228d76c36e8f4d7e927538c8d (patch)
tree4d478b8b1dd6035efbb55478a4c767ca6debbb4d /source/blender/editors/screen
parent05e5e00bc9fb5d0fd8f49d2315d4061cacdb83ab (diff)
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?
Diffstat (limited to 'source/blender/editors/screen')
-rw-r--r--source/blender/editors/screen/area.c18
1 files changed, 9 insertions, 9 deletions
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;
}
}
+
}
-
}