aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquickflickable.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/quick/items/qquickflickable.cpp')
-rw-r--r--src/quick/items/qquickflickable.cpp22
1 files changed, 21 insertions, 1 deletions
diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp
index ff56bcaa0e..e6b39d5380 100644
--- a/src/quick/items/qquickflickable.cpp
+++ b/src/quick/items/qquickflickable.cpp
@@ -423,12 +423,16 @@ void QQuickFlickablePrivate::fixupX_callback(void *data)
void QQuickFlickablePrivate::fixupX()
{
Q_Q(QQuickFlickable);
+ if (!q->isComponentComplete())
+ return; //Do not fixup from initialization values
fixup(hData, q->minXExtent(), q->maxXExtent());
}
void QQuickFlickablePrivate::fixupY()
{
Q_Q(QQuickFlickable);
+ if (!q->isComponentComplete())
+ return; //Do not fixup from initialization values
fixup(vData, q->minYExtent(), q->maxYExtent());
}
@@ -913,6 +917,18 @@ void QQuickFlickable::setFlickableDirection(FlickableDirection direction)
}
}
+/*!
+ \qmlproperty bool QtQuick2::Flickable::pixelAligned
+
+ This property sets the alignment of \l contentX and \l contentY to
+ pixels (\c true) or subpixels (\c false).
+
+ Enable pixelAligned to optimize for still content or moving content with
+ high constrast edges, such as one-pixel-wide lines, text or vector graphics.
+ Disable pixelAligned when optimizing for animation quality.
+
+ The default is \c false.
+*/
bool QQuickFlickable::pixelAligned() const
{
Q_D(const QQuickFlickable);
@@ -2265,7 +2281,11 @@ bool QQuickFlickablePrivate::isViewMoving() const
within the timeout, both the press and release will be delivered.
Note that for nested Flickables with pressDelay set, the pressDelay of
- outer Flickables is overridden by the innermost Flickable.
+ outer Flickables is overridden by the innermost Flickable. If the drag
+ exceeds the platform drag threshold, the press event will be delivered
+ regardless of this property.
+
+ \sa QStyleHints
*/
int QQuickFlickable::pressDelay() const
{