Merge pull request #379 from diizy/stable-0.4

Updated knob code, now everything seems to work really smoothly regardle...

include/knob.h

@@ -36,8 +36,6 @@
 class QPixmap;
 class textFloat;
 
-#define KNOB_SMOOTH_FACTOR 0.125f
-
 enum knobTypes
 {
 	knobDark_28, knobBright_26, knobSmall_17, knobGreen_17, knobVintage_32, knobStyled
@@ -55,7 +53,7 @@ class EXPORT knob : public QWidget, public FloatModelView
 	Q_PROPERTY(float centerPointY READ centerPointY WRITE setCenterPointY)
 
 	Q_PROPERTY(float lineWidth READ lineWidth WRITE setLineWidth)
-	
+
 	// Unfortunately, the gradient syntax doesn't create our gradient
 	// correctly so we need to do this:
 	Q_PROPERTY(QColor outerColor READ outerColor WRITE setOuterColor)
@@ -90,8 +88,8 @@ public:
 
 	float lineWidth() const;
 	void setLineWidth( float _w );
-	
-	QColor outerColor() const; 
+
+	QColor outerColor() const;
 	void setOuterColor( const QColor & _c );
 
 
@@ -140,9 +138,7 @@ private:
 
 	inline float pageSize() const
 	{
-		return( qMax<float>( ( model()->maxValue() -
-					model()->minValue() ) / 100.0f,
-					modelUntyped()->step<float>() ) );
+		return ( model()->maxValue() - model()->minValue() ) / 100.0f;
 	}
 
 
@@ -156,6 +152,7 @@ private:
 
 	QPoint m_mouseOffset;
 	QPoint m_origMousePos;
+	float m_leftOver;
 	bool m_buttonPressed;
 
 	float m_totalAngle;

src/gui/widgets/knob.cpp

@@ -388,12 +388,19 @@ void knob::drawKnob( QPainter * _p )
 }
 
 float knob::getValue( const QPoint & _p )
-{	
-	if( engine::mainWindow()->isShiftPressed() )
+{
+	float value;
+
+	// arcane mathemagicks for calculating knob movement 
+	value = ( ( _p.y() + _p.y() * qMin( qAbs( _p.y() / 2 ), 6 ) ) ) / 10.0f;
+	
+	// if shift pressed we want slower movement
+	if( engine::mainWindow()->isShiftPressed() )	
 	{
-		return ( _p.y() * model()->step<float>());
-	}
-	return ( _p.y() * KNOB_SMOOTH_FACTOR * pageSize() );
+		value /= 4.0f;
+		value = qBound( -4.0f, value, 4.0f );
+	}		
+	return value * pageSize();
 }
 
 
@@ -463,6 +470,7 @@ void knob::mousePressEvent( QMouseEvent * _me )
 		const QPoint & p = _me->pos();
 		m_origMousePos = p;
 		m_mouseOffset = QPoint(0, 0);
+		m_leftOver = 0.0f;
 
 		emit sliderPressed();
 
@@ -580,7 +588,18 @@ void knob::wheelEvent( QWheelEvent * _we )
 
 void knob::setPosition( const QPoint & _p )
 {
-	model()->setValue( model()->value() - getValue(_p) );
+	const float value = getValue( _p ) + m_leftOver;
+	const float step = model()->step<float>();
+	
+	if( qAbs( value ) >= step )
+	{
+		model()->setValue( model()->value() - value );
+		m_leftOver = 0.0f;
+	}
+	else
+	{
+		m_leftOver = value;
+	}
 }