168492376
/
qskinny
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wheel event handler improved - more work to do

This commit is contained in:
Uwe Rathmann 2018-01-03 15:05:35 +01:00
parent eafd887f9c
commit 6edeca7360
2 changed files with 43 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/controls/QskRangeControl.cpp
View File

@ -281,7 +281,7 @@ void QskRangeControl::wheelEvent( QWheelEvent* event )
if( isReadOnly() ) if( isReadOnly() )
return; return;
const int steps = event->delta() / 120; const int steps = event->delta() / QWheelEvent::DefaultDeltasPerStep;
setValue( m_data->value + steps * m_data->stepSize ); setValue( m_data->value + steps * m_data->stepSize );
} }

44
src/controls/QskScrollView.cpp
View File

@ -340,8 +340,48 @@ void QskScrollView::gestureEvent( QskGestureEvent* event )
void QskScrollView::wheelEvent( QWheelEvent* event ) void QskScrollView::wheelEvent( QWheelEvent* event )
{ {
const qreal dy = event->delta() / 120 * 20.0; const qreal stepSize = 20.0; // how to find this value
setScrollPos( m_data->scrollPos - QPointF( 0.0, dy ) );
QPointF offset;
if ( subControlRect( Viewport ).contains( event->posF() ) )
{
/*
Not sure if that code makes sense, but I don't have an input device
that generates wheel events in both directions. TODO ...
*/
//offset = event->pixelDelta();
if ( offset.isNull() )
{
offset = event->angleDelta();
offset *= stepSize / QWheelEvent::DefaultDeltasPerStep;
}
}
else
{
const qreal delta = stepSize * event->delta() / QWheelEvent::DefaultDeltasPerStep;
if ( subControlRect( VerticalScrollBar ).contains( event->posF() ) )
{
offset.setY( delta );
}
else if ( subControlRect( HorizontalScrollBar ).contains( event->posF() ) )
{
offset.setX( delta );
}
}
if ( !offset.isNull() )
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
if ( event->inverted() )
offset = -offset;
#endif
setScrollPos( m_data->scrollPos - offset );
}
} }
#endif #endif