[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17493] branches/animsys2/source/blender/ src: AnimSys2: Minor tweaks

[Joshua Leung]

Revision: 17493
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17493
Author:   aligorith
Date:     2008-11-18 08:53:36 +0100 (Tue, 18 Nov 2008)

Log Message:
-----------
AnimSys2: Minor tweaks

* Made current frame indicator waste less space
* Minor formatting tweaks

Modified Paths:
--------------
    branches/animsys2/source/blender/src/drawaction.c
    branches/animsys2/source/blender/src/drawipo.c
    branches/animsys2/source/blender/src/header_action.c

Modified: branches/animsys2/source/blender/src/drawaction.c
===================================================================
--- branches/animsys2/source/blender/src/drawaction.c	2008-11-18 05:47:19 UTC (rev 17492)
+++ branches/animsys2/source/blender/src/drawaction.c	2008-11-18 07:53:36 UTC (rev 17493)
@@ -438,7 +438,7 @@
 		sprintf(str, "   %.2f", FRA2TIME(CFRA));
 	else 
 		sprintf(str, "   %d", CFRA);
-	slen= GetButStringLength(str);
+	slen= BIF_GetStringWidth(G.font, str, 0);
 	
 	/* get starting coordinates for drawing */
 	x= cfra * xscale;
@@ -446,11 +446,11 @@
 	/* draw green box around/behind text */
 	BIF_ThemeColor(TH_CFRAME);
 	BIF_ThemeColorShadeAlpha(TH_CFRAME, 0, -100);
-	glRectf(x,  0,  x+slen,  20);
+	glRectf(x,  0,  x+slen,  15);
 	
 	/* draw current frame number - black text */
 	BIF_ThemeColor(TH_TEXT);
-	ui_rasterpos_safe(x, 3, 1.0);
+	ui_rasterpos_safe(x-5, 3, 1.0);
 	BIF_DrawString(G.fonts, str, 0);
 	
 	/* restore view transform */
@@ -1569,7 +1569,7 @@
 		/* Draw channel names */
 		draw_channel_names();
 		
-		if(sa->winx > 50 + NAMEWIDTH + SLIDERWIDTH) {
+		if (sa->winx > 50 + NAMEWIDTH + SLIDERWIDTH) {
 			if (ELEM(G.saction->mode, SACTCONT_ACTION, SACTCONT_DOPESHEET)) {
 				/* if there is an action, draw sliders for its
 				 * ipo-curve channels in the action window

Modified: branches/animsys2/source/blender/src/drawipo.c
===================================================================
--- branches/animsys2/source/blender/src/drawipo.c	2008-11-18 05:47:19 UTC (rev 17492)
+++ branches/animsys2/source/blender/src/drawipo.c	2008-11-18 07:53:36 UTC (rev 17493)
@@ -1571,7 +1571,7 @@
 	
 	/* extrapolate to right? (see code for left-extrapolation above too) */
 	if ((icu->extrap & IPO_CYCL)==0) {
-		if(prevbezt->vec[1][0] < G.v2d->cur.xmax) {
+		if (prevbezt->vec[1][0] < G.v2d->cur.xmax) {
 			v1[0]= G.v2d->cur.xmax;
 			
 			/* y-value depends on the interpolation */

Modified: branches/animsys2/source/blender/src/header_action.c
===================================================================
--- branches/animsys2/source/blender/src/header_action.c	2008-11-18 05:47:19 UTC (rev 17492)
+++ branches/animsys2/source/blender/src/header_action.c	2008-11-18 07:53:36 UTC (rev 17493)
@@ -238,7 +238,7 @@
 			G.v2d->cur.xmin = 0;
 			G.v2d->cur.ymin=-SCROLLB;
 			
-			if (G.saction->action) {
+			if ((G.saction->mode==SACTCONT_ACTION) && (G.saction->action)) {
 				float extra;
 				
 				calc_action_range(G.saction->action, &G.v2d->cur.xmin, &G.v2d->cur.xmax, 0);
@@ -260,8 +260,9 @@
 				G.v2d->cur.xmax= 65.0;
 			}
 			
+			// FIXME: this vertical alignment is bad!
 			G.v2d->cur.ymin= -75.0;
-			G.v2d->cur.ymax= 5.0;
+			G.v2d->cur.ymax= 0.0;
 			
 			G.v2d->tot= G.v2d->cur;
 			test_view2d(G.v2d, curarea->winx, curarea->winy);