hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Widgets/Fader: improved usability by not jumping to mouse click position

Browse Source 
The previous behaviour was very annoying because starting to drag the
knob almost always resulted in a value change. This has been changed
by a rewritten logic for mouse click and move behaviour.

Closes #3588157.
This commit is contained in:
Tobias Doerffel
2012-11-28 00:07:56 +01:00
parent 3739ef82c6
commit 8db0d0b0fa
2 changed files with 33 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/fader.h
View File

@@ -1,7 +1,7 @@
/*
* fader.h - fader-widget used in FX-mixer - partly taken from Hydrogen
*
* Copyright (c) 2008-2011 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2008-2012 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -91,6 +91,7 @@ private:
void setPeak( float fPeak, float &targetPeak, float &persistentPeak, QTime &lastPeakTime );
int calculateDisplayPeak( float fPeak );
float m_fPeakValue_L;
float m_fPeakValue_R;
float m_persistentPeak_L;
@@ -105,6 +106,9 @@ private:
QPixmap m_leds;
QPixmap m_knob;
int m_moveStartPoint;
float m_startValue;
static textFloat * s_textFloat;
void updateTextFloat();

43
src/gui/widgets/fader.cpp
View File

@@ -73,7 +73,9 @@ fader::fader( FloatModel * _model, const QString & _name, QWidget * _parent ) :
m_fMaxPeak( 1.1 ),
m_back( embed::getIconPixmap( "fader_background" ) ),
m_leds( embed::getIconPixmap( "fader_leds" ) ),
m_knob( embed::getIconPixmap( "fader_knob" ) )
m_knob( embed::getIconPixmap( "fader_knob" ) ),
m_moveStartPoint( -1 ),
m_startValue( 0 )
{
if( s_textFloat == NULL )
{
@@ -107,35 +109,46 @@ void fader::contextMenuEvent( QContextMenuEvent * _ev )
void fader::mouseMoveEvent( QMouseEvent *ev )
void fader::mouseMoveEvent( QMouseEvent *mouseEvent )
{
float fVal = (float)( height() - ev->y() ) / (float)height();
fVal = fVal * ( m_model->maxValue() - m_model->minValue() );
if( m_moveStartPoint >= 0 )
{
int dy = m_moveStartPoint - mouseEvent->globalY();
fVal = fVal + m_model->minValue();
float delta = dy * ( m_model->maxValue() - m_model->minValue() ) / (float) ( height() - m_knob.height() );
m_model->setValue( fVal );
model()->setValue( m_startValue + delta );
updateTextFloat();
updateTextFloat();
}
}
void fader::mousePressEvent( QMouseEvent * _me )
void fader::mousePressEvent( QMouseEvent* mouseEvent )
{
if( _me->button() == Qt::LeftButton &&
! ( _me->modifiers() & Qt::ControlModifier ) )
if( mouseEvent->button() == Qt::LeftButton &&
! ( mouseEvent->modifiers() & Qt::ControlModifier ) )
{
updateTextFloat();
s_textFloat->show();
if( mouseEvent->y() >= knobPosY() - m_knob.height() && mouseEvent->y() < knobPosY() )
{
updateTextFloat();
s_textFloat->show();
mouseMoveEvent( _me );
_me->accept();
m_moveStartPoint = mouseEvent->globalY();
m_startValue = model()->value();
mouseEvent->accept();
}
else
{
m_moveStartPoint = -1;
}
}
else
{
AutomatableModelView::mousePressEvent( _me );
AutomatableModelView::mousePressEvent( mouseEvent );
}
}