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

avoid deprecation warnings

Browse Source
This commit is contained in:
Uwe Rathmann 2020-03-12 09:59:07 +01:00
parent 9fe283d24e
commit 132095e8db
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/controls/QskScrollView.cpp
View File

@ -210,13 +210,24 @@ QPointF QskScrollView::scrollOffset( const QWheelEvent* event ) const
{ {
QPointF offset; QPointF offset;
if ( subControlRect( VerticalScrollBar ).contains( event->posF() ) ) #if QT_VERSION < 0x050e00
const auto wheelPos = event->posF();
const auto wheelDelta = event->delta();
#else
const auto wheelPos = event->position();
const QPoint delta = event->angleDelta();
const int wheelDelta = ( qAbs( delta.x() ) > qAbs( delta.y() ) )
? delta.x() : delta.y();
#endif
if ( subControlRect( VerticalScrollBar ).contains( wheelPos ) )
{ {
offset.setY( event->delta() ); offset.setY( wheelDelta );
} }
else if ( subControlRect( HorizontalScrollBar ).contains( event->posF() ) ) else if ( subControlRect( HorizontalScrollBar ).contains( wheelPos ) )
{ {
offset.setX( event->delta() ); offset.setX( wheelDelta );
} }
else else
{ {