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

QskScrollBox::scrollOffset reintroduced

Browse Source
This commit is contained in:
Uwe Rathmann 2022-01-07 15:34:13 +01:00
parent 3f0aaae1a1
commit 1dd3127f9f
4 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/controls/QskScrollBox.cpp
View File

@ -400,15 +400,20 @@ void QskScrollBox::gestureEvent( QskGestureEvent* event )
#ifndef QT_NO_WHEELEVENT #ifndef QT_NO_WHEELEVENT
void QskScrollBox::wheelEvent( QWheelEvent* event ) QPointF QskScrollBox::scrollOffset( const QWheelEvent* event ) const
{ {
const auto pos = qskWheelPosition( event ); const auto pos = qskWheelPosition( event );
if ( viewContentsRect().contains( pos ) ) if ( viewContentsRect().contains( pos ) )
{ return qskScrollIncrement( event );
const auto offset = qskScrollIncrement( event );
if ( !offset.isNull() ) return QPointF();
setScrollPos( m_data->scrollPos - offset ); }
}
void QskScrollBox::wheelEvent( QWheelEvent* event )
{
const auto offset = scrollOffset( event );
if ( !offset.isNull() )
setScrollPos( m_data->scrollPos - offset );
} }
#endif #endif

1
src/controls/QskScrollBox.h
View File

@ -68,6 +68,7 @@ class QSK_EXPORT QskScrollBox : public QskControl
#ifndef QT_NO_WHEELEVENT #ifndef QT_NO_WHEELEVENT
void wheelEvent( QWheelEvent* ) override; void wheelEvent( QWheelEvent* ) override;
virtual QPointF scrollOffset( const QWheelEvent* ) const;
#endif #endif
bool gestureFilter( QQuickItem*, QEvent* ) override; bool gestureFilter( QQuickItem*, QEvent* ) override;

9
src/controls/QskScrollView.cpp
View File

@ -209,7 +209,7 @@ void QskScrollView::mouseReleaseEvent( QMouseEvent* event )
#ifndef QT_NO_WHEELEVENT #ifndef QT_NO_WHEELEVENT
void QskScrollView::wheelEvent( QWheelEvent* event ) QPointF QskScrollView::scrollOffset( const QWheelEvent* event ) const
{ {
QPointF offset; QPointF offset;
@ -236,13 +236,12 @@ void QskScrollView::wheelEvent( QWheelEvent* event )
} }
offset.setX( dx ); offset.setX( dx );
} }
else if ( viewContentsRect().contains( pos ) ) else
{ {
offset = qskScrollIncrement( event ); offset = Inherited::scrollOffset( event );
} }
if ( !offset.isNull() ) return offset;
setScrollPos( scrollPos() - offset );
} }
#endif #endif

2
src/controls/QskScrollView.h
View File

@ -53,7 +53,7 @@ class QSK_EXPORT QskScrollView : public QskScrollBox
void mouseReleaseEvent( QMouseEvent* ) override; void mouseReleaseEvent( QMouseEvent* ) override;
#ifndef QT_NO_WHEELEVENT #ifndef QT_NO_WHEELEVENT
void wheelEvent( QWheelEvent* ) override; QPointF scrollOffset( const QWheelEvent* ) const override;
#endif #endif
private: private: