[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26385] trunk/blender/source/blender/ editors: Fix [#20447] Minor infobar bugs
Matt Ebb
matt at mke3.net
Fri Jan 29 02:57:15 CET 2010
Revision: 26385
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26385
Author: broken
Date: 2010-01-29 02:57:15 +0100 (Fri, 29 Jan 2010)
Log Message:
-----------
Fix [#20447] Minor infobar bugs
Limited headers to normal header height until multi-line headers are properly implemented.
Modified Paths:
--------------
trunk/blender/source/blender/editors/screen/screen_ops.c
trunk/blender/source/blender/editors/space_info/space_info.c
Modified: trunk/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_ops.c 2010-01-29 01:20:57 UTC (rev 26384)
+++ trunk/blender/source/blender/editors/screen/screen_ops.c 2010-01-29 01:57:15 UTC (rev 26385)
@@ -1374,6 +1374,7 @@
if(az->ar) {
RegionMoveData *rmd= MEM_callocN(sizeof(RegionMoveData), "RegionMoveData");
+ int maxsize;
op->customdata= rmd;
@@ -1397,8 +1398,15 @@
} else {
rmd->origval= rmd->ar->sizey;
}
- CLAMP(rmd->maxsize, 0, 1000);
+ /* limit headers to standard height for now */
+ if (rmd->ar->regiontype == RGN_TYPE_HEADER)
+ maxsize = rmd->ar->type->prefsizey;
+ else
+ maxsize = 1000;
+
+ CLAMP(rmd->maxsize, 0, maxsize);
+
/* add temp handler */
WM_event_add_modal_handler(C, op);
Modified: trunk/blender/source/blender/editors/space_info/space_info.c
===================================================================
--- trunk/blender/source/blender/editors/space_info/space_info.c 2010-01-29 01:20:57 UTC (rev 26384)
+++ trunk/blender/source/blender/editors/space_info/space_info.c 2010-01-29 01:57:15 UTC (rev 26385)
@@ -116,12 +116,16 @@
/* add handlers, stuff you only do once or on area/region changes */
static void info_main_area_init(wmWindowManager *wm, ARegion *ar)
{
- ED_region_panels_init(wm, ar);
}
static void info_main_area_draw(const bContext *C, ARegion *ar)
{
- ED_region_panels(C, ar, 1, NULL, -1);
+ float col[3];
+
+ /* clear and setup matrix */
+ UI_GetThemeColor3fv(TH_BACK, col);
+ glClearColor(col[0], col[1], col[2], 0.0);
+ glClear(GL_COLOR_BUFFER_BIT);
}
void info_operatortypes(void)
More information about the Bf-blender-cvs
mailing list