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

LcdSpinBox: check for mouse button in mouseReleaseEvent()

Browse Source 
Otherwise we restore things that were never changed when releasing right
or middle mouse button.

Closes #358.
This commit is contained in:
Tobias Doerffel
2014-02-20 21:44:26 +01:00
parent 2049e00901
commit e6883e7743
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/lcd_spinbox.h
View File

@@ -72,6 +72,7 @@ protected:
virtual void wheelEvent( QWheelEvent * _we );
private:
bool m_mouseMoving;
QPoint m_origMousePos;
int m_displayOffset;

20
src/gui/widgets/lcd_spinbox.cpp
View File

@@ -43,6 +43,7 @@
lcdSpinBox::lcdSpinBox( int numDigits, QWidget* parent, const QString& name ) :
LcdWidget( numDigits, parent, name ),
IntModelView( new IntModel( 0, 0, 0, NULL, name, true ), this ),
m_mouseMoving( false ),
m_origMousePos(),
m_displayOffset( 0 )
{
@@ -54,6 +55,7 @@ lcdSpinBox::lcdSpinBox( int numDigits, QWidget* parent, const QString& name ) :
lcdSpinBox::lcdSpinBox( int numDigits, const QString& style, QWidget* parent, const QString& name ) :
LcdWidget( numDigits, parent, name ),
IntModelView( new IntModel( 0, 0, 0, NULL, name, true ), this ),
m_mouseMoving( false ),
m_origMousePos(),
m_displayOffset( 0 )
{
@@ -78,8 +80,6 @@ void lcdSpinBox::update()
void lcdSpinBox::contextMenuEvent( QContextMenuEvent* event )
{
m_origMousePos = event->globalPos();
// for the case, the user clicked right while pressing left mouse-
// button, the context-menu appears while mouse-cursor is still hidden
// and it isn't shown again until user does something which causes
@@ -100,6 +100,7 @@ void lcdSpinBox::mousePressEvent( QMouseEvent* event )
! ( event->modifiers() & Qt::ControlModifier ) &&
event->y() < cellHeight() + 2 )
{
m_mouseMoving = true;
m_origMousePos = event->globalPos();
QApplication::setOverrideCursor( Qt::BlankCursor );
model()->prepareJournalEntryFromOldVal();
@@ -115,7 +116,7 @@ void lcdSpinBox::mousePressEvent( QMouseEvent* event )
void lcdSpinBox::mouseMoveEvent( QMouseEvent* event )
{
if( event->buttons() & Qt::LeftButton )
if( m_mouseMoving )
{
int dy = event->globalY() - m_origMousePos.y();
if( dy > 1 || dy < -1 )
@@ -131,12 +132,17 @@ void lcdSpinBox::mouseMoveEvent( QMouseEvent* event )
void lcdSpinBox::mouseReleaseEvent( QMouseEvent* event )
void lcdSpinBox::mouseReleaseEvent( QMouseEvent* )
{
model()->addJournalEntryFromOldToCurVal();
if( m_mouseMoving )
{
model()->addJournalEntryFromOldToCurVal();
QCursor::setPos( m_origMousePos );
QApplication::restoreOverrideCursor();
QCursor::setPos( m_origMousePos );
QApplication::restoreOverrideCursor();
m_mouseMoving = false;
}
}