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

minor changes

Browse Source
This commit is contained in:
Uwe Rathmann 2023-03-20 11:02:43 +01:00
parent 266ccc8f21
commit 3d9dca4500
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/controls/QskScrollBox.cpp
View File

@ -15,6 +15,11 @@ QSK_QT_PRIVATE_BEGIN
#include <private/qquickwindow_p.h> #include <private/qquickwindow_p.h>
QSK_QT_PRIVATE_END QSK_QT_PRIVATE_END
static inline constexpr qreal qskViewportPadding()
{
return 10.0; // should be from the skin, TODO ...
}
namespace namespace
{ {
class FlickAnimator final : public QskFlickAnimator class FlickAnimator final : public QskFlickAnimator
@ -100,11 +105,6 @@ namespace
class QskScrollBox::PrivateData class QskScrollBox::PrivateData
{ {
public: public:
PrivateData()
: autoScrollFocusItem( true )
{
}
QPointF scrollPos; QPointF scrollPos;
QSizeF scrollableSize = QSize( 0.0, 0.0 ); QSizeF scrollableSize = QSize( 0.0, 0.0 );
@ -114,9 +114,7 @@ class QskScrollBox::PrivateData
FlickAnimator flicker; FlickAnimator flicker;
ScrollAnimator scroller; ScrollAnimator scroller;
const qreal viewportPadding = 10; bool autoScrollFocusItem = true;
bool autoScrollFocusItem : 1;
}; };
QskScrollBox::QskScrollBox( QQuickItem* parent ) QskScrollBox::QskScrollBox( QQuickItem* parent )
@ -270,7 +268,7 @@ void QskScrollBox::ensureItemVisible( const QQuickItem* item )
void QskScrollBox::ensureVisible( const QPointF& pos ) void QskScrollBox::ensureVisible( const QPointF& pos )
{ {
const qreal margin = m_data->viewportPadding; const qreal margin = qskViewportPadding();
QRectF r( scrollPos(), viewContentsRect().size() ); QRectF r( scrollPos(), viewContentsRect().size() );
r.adjust( margin, margin, -margin, -margin ); r.adjust( margin, margin, -margin, -margin );
@ -306,7 +304,7 @@ void QskScrollBox::ensureVisible( const QPointF& pos )
void QskScrollBox::ensureVisible( const QRectF& itemRect ) void QskScrollBox::ensureVisible( const QRectF& itemRect )
{ {
const qreal margin = m_data->viewportPadding; const qreal margin = qskViewportPadding();
QRectF r( scrollPos(), viewContentsRect().size() ); QRectF r( scrollPos(), viewContentsRect().size() );
r.adjust( margin, margin, -margin, -margin ); r.adjust( margin, margin, -margin, -margin );
@ -494,7 +492,7 @@ bool QskScrollBox::gestureFilter( QQuickItem* item, QEvent* event )
recognizer.setTimeout( ( item == this ) ? -1 : m_data->panRecognizerTimeout ); recognizer.setTimeout( ( item == this ) ? -1 : m_data->panRecognizerTimeout );
} }
return m_data->panRecognizer.processEvent( item, event ); return recognizer.processEvent( item, event );
} }
QPointF QskScrollBox::boundedScrollPos( const QPointF& pos ) const QPointF QskScrollBox::boundedScrollPos( const QPointF& pos ) const