[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24186] trunk/blender/source/blender/ editors/interface/interface_handlers.c: Revert changes committed by accident in 24168

[Martin Poirier]

Revision: 24186
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24186
Author:   theeth
Date:     2009-10-30 18:50:45 +0100 (Fri, 30 Oct 2009)

Log Message:
-----------
Revert changes committed by accident in 24168
(this was experimental code for "ladder-like" mouse adjustment of float values)

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_handlers.c

Property Changed:
----------------
    trunk/blender/source/blender/editors/interface/interface_handlers.c

Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c	2009-10-30 17:48:50 UTC (rev 24185)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c	2009-10-30 17:50:45 UTC (rev 24186)
@@ -2034,10 +2034,9 @@
 	return temp;
 }
 
-static int ui_numedit_but_NUM(uiBut *but, uiHandleButtonData *data, float fac, int snap, int mx, int my)
+static int ui_numedit_but_NUM(uiBut *but, uiHandleButtonData *data, float fac, int snap, int mx)
 {
 	float deler, tempf, softmin, softmax, softrange;
-	float ladder = powf(10.0, floorf((my - data->dragstarty) / 100.0f));
 	int lvalue, temp, changed= 0;
 	
 	if(mx == data->draglastx)
@@ -2063,7 +2062,7 @@
 		 * 2px == 1-int, or 1px == 1-ClickStep */
 		if(ui_is_but_float(but)) {
 			fac *= 0.01*but->a1;
-			tempf = data->startvalue + ((mx - data->dragstartx) * fac) * ladder;
+			tempf = data->startvalue + ((mx - data->dragstartx) * fac);
 			tempf= ui_numedit_apply_snapf(tempf, softmin, softmax, softrange, snap);
 
 #if 1		/* fake moving the click start, nicer for dragging back after passing the limit */
@@ -2087,7 +2086,7 @@
 		else {
 			fac = 0.5; /* simple 2px == 1 */
 
-			temp= data->startvalue + ((mx - data->dragstartx) * fac) * ladder;
+			temp= data->startvalue + ((mx - data->dragstartx) * fac);
 			temp= ui_numedit_apply_snap(temp, softmin, softmax, snap);
 
 #if 1		/* fake moving the click start, nicer for dragging back after passing the limit */
@@ -2122,13 +2121,13 @@
 
 		if(ui_is_but_float(but) && softrange > 11) {
 			/* non linear change in mouse input- good for high precicsion */
-			data->dragf+= (((float)(mx-data->draglastx))/deler) * (fabs(data->dragstartx-mx)*0.002)*ladder;
+			data->dragf+= (((float)(mx-data->draglastx))/deler) * (fabs(data->dragstartx-mx)*0.002);
 		} else if (!ui_is_but_float(but) && softrange > 129) { /* only scale large int buttons */
 			/* non linear change in mouse input- good for high precicsionm ints need less fine tuning */
-			data->dragf+= (((float)(mx-data->draglastx))/deler) * (fabs(data->dragstartx-mx)*0.004)*ladder;
+			data->dragf+= (((float)(mx-data->draglastx))/deler) * (fabs(data->dragstartx-mx)*0.004);
 		} else {
 			/*no scaling */
-			data->dragf+= ((float)(mx-data->draglastx))/deler*ladder ;
+			data->dragf+= ((float)(mx-data->draglastx))/deler ;
 		}
 	
 		if(data->dragf>1.0) data->dragf= 1.0;
@@ -2198,7 +2197,6 @@
 			}
 			else if(event->type == LEFTMOUSE) {
 				data->dragstartx= data->draglastx= ui_is_a_warp_but(but) ? screen_mx:mx;
-				data->dragstarty= data->draglasty= ui_is_a_warp_but(but) ? screen_my:my;
 				button_activate_state(C, but, BUTTON_STATE_NUM_EDITING);
 				retval= WM_UI_HANDLER_BREAK;
 			}
@@ -2237,7 +2235,7 @@
 			
 			snap= (event->ctrl)? (event->shift)? 2: 1: 0;
 
-			if(ui_numedit_but_NUM(but, data, fac, snap, (ui_is_a_warp_but(but) ? screen_mx:mx), (ui_is_a_warp_but(but) ? screen_my:my)))
+			if(ui_numedit_but_NUM(but, data, fac, snap, (ui_is_a_warp_but(but) ? screen_mx:mx)))
 				ui_numedit_apply(C, block, but, data);
 		}
 		retval= WM_UI_HANDLER_BREAK;
@@ -2423,9 +2421,7 @@
 			}
 			else if(event->type == LEFTMOUSE) {
 				data->dragstartx= mx;
-				data->dragstarty= my;
 				data->draglastx= mx;
-				data->draglasty= my;
 				button_activate_state(C, but, BUTTON_STATE_NUM_EDITING);
 				retval= WM_UI_HANDLER_BREAK;
 			}
@@ -2526,10 +2522,14 @@
 	if(data->state == BUTTON_STATE_HIGHLIGHT) {
 		if(event->val==KM_PRESS) {
 			if(event->type == LEFTMOUSE) {
-				data->dragstartx= mx;
-				data->draglastx= mx;
-				data->dragstartx= my;
-				data->draglastx= my;
+				if(horizontal) {
+					data->dragstartx= mx;
+					data->draglastx= mx;
+				}
+				else {
+					data->dragstartx= my;
+					data->draglastx= my;
+				}
 				button_activate_state(C, but, BUTTON_STATE_NUM_EDITING);
 				retval= WM_UI_HANDLER_BREAK;
 			}


Property changes on: trunk/blender/source/blender/editors/interface/interface_handlers.c
___________________________________________________________________
Name: svn:mergeinfo
   -