[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11348] trunk/blender/source/blender/src: == Action Editor - Bugfixes ==

[Joshua Leung]

Revision: 11348
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11348
Author:   aligorith
Date:     2007-07-23 13:45:13 +0200 (Mon, 23 Jul 2007)

Log Message:
-----------
== Action Editor - Bugfixes ==

* It is now possible to work on keyframe data/scrub the timeline when the Action Editor is squished up so that the left-hand panel disappears. 
* I'm not sure whether I've eliminated a bug with long-keyframes where sometimes the selection status was show incorrectly (keyframe after keyframe marking end of long-keyframe is selected, results in long-keyframe selection).
* Changed a few obscure comments

Modified Paths:
--------------
    trunk/blender/source/blender/src/drawaction.c
    trunk/blender/source/blender/src/editaction.c

Modified: trunk/blender/source/blender/src/drawaction.c
===================================================================
--- trunk/blender/source/blender/src/drawaction.c	2007-07-23 11:28:43 UTC (rev 11347)
+++ trunk/blender/source/blender/src/drawaction.c	2007-07-23 11:45:13 UTC (rev 11348)
@@ -345,6 +345,7 @@
 	Object *ob;
 	float vec[2];
 	
+	/* Draw a light green line to indicate current frame */
 	vec[0]= (G.scene->r.cfra);
 	vec[0]*= G.scene->r.framelen;
 	
@@ -358,6 +359,7 @@
 	glVertex2fv(vec);
 	glEnd();
 	
+	/* Draw dark green line if slow-parenting/time-offset is enabled */
 	ob= (G.scene->basact) ? (G.scene->basact->object) : 0;
 	if(ob && ob->sf!=0.0 && (ob->ipoflag & OB_OFFS_OB) ) {
 		vec[0]-= ob->sf;
@@ -749,7 +751,7 @@
 	/* free tempolary channels used for drawing */
 	BLI_freelistN(&act_data);
 
-	/* black lines marking bounds for Time-Slide transform mode */
+	/* black line marking 'current frame' for Time-Slide transform mode */
 	if (G.saction->flag & SACTION_MOVING) {
 		int frame1_x, channel_y;
 		
@@ -921,6 +923,7 @@
 		if (G.v2d->scroll) drawscroll(0);
 	}
 
+	/* Draw Left-Hand Panel if enough space in window */
 	if (G.v2d->mask.xmin!=0) {
 		/* Draw channel names */
 		draw_channel_names();
@@ -1055,6 +1058,8 @@
 	
 	if (BEZSELECTED(prev) || BEZSELECTED(beztn))
 		abn->sel = SELECT;
+	else
+		abn->sel = 0;
 	abn->modified = 1;
 }
 
@@ -1108,7 +1113,7 @@
 				gla2DDrawTranslatePt(di, ab->end, ypos, &sc_xb, &sc_yb);
 				
 				/* draw block */
-				if (ab->sel & 1)
+				if (ab->sel)
 					BIF_ThemeColor4(TH_STRIP_SELECT);
 				else
 					BIF_ThemeColor4(TH_STRIP);

Modified: trunk/blender/source/blender/src/editaction.c
===================================================================
--- trunk/blender/source/blender/src/editaction.c	2007-07-23 11:28:43 UTC (rev 11347)
+++ trunk/blender/source/blender/src/editaction.c	2007-07-23 11:45:13 UTC (rev 11348)
@@ -2985,7 +2985,7 @@
 		case LEFTMOUSE:
 			if(view2dmove(LEFTMOUSE)) // only checks for sliders
 				break;
-			else if (mval[0]>ACTWIDTH) {
+			else if ((G.v2d->mask.xmin==0) || (mval[0]>ACTWIDTH)) {
 				do {
 					getmouseco_areawin(mval);
 					
@@ -3007,7 +3007,7 @@
 			/* passed on as selection */
 		case RIGHTMOUSE:
 			/* Clicking in the channel area */
-			if (mval[0]<NAMEWIDTH) {
+			if ((G.v2d->mask.xmin) && (mval[0]<NAMEWIDTH)) {
 				if (datatype == ACTCONT_ACTION) {
 					/* mouse is over action channels */
 					if (G.qual & LR_CTRLKEY)
@@ -3017,7 +3017,7 @@
 				}
 				else numbuts_action();
 			}
-			else if (mval[0]>ACTWIDTH) {
+			else {
 				short select_mode= (G.qual & LR_SHIFTKEY)? SELECT_INVERT: SELECT_REPLACE;
 				
 				/* Clicking in the vertical scrollbar selects