diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2013-06-24 11:26:22 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-06-24 11:48:46 +0200 |
commit | 1a9759855639b9e2b3cdc0687d3381dcbf6c9815 (patch) | |
tree | b2da51f6eddddb83c2d97cdcfac24d38d2e67a4e /src/quick/items/qquickflickable.cpp | |
parent | 8217ec1b888f3ff93f004801b018c5f85362c484 (diff) | |
parent | e1fc2793aef53b84a3f1e19b6d6bdf1141340074 (diff) |
Merge branch 'dev' of ssh://codereview.qt-project.org/qt/qtdeclarative into wip/v4
Conflicts:
src/imports/qtquick2/plugins.qmltypes
src/qml/debugger/qv8debugservice.cpp
src/qml/qml/qml.pri
src/qml/qml/qqmlcompiler.cpp
src/qml/qml/qqmlcomponent.cpp
src/qml/qml/qqmlcontext.cpp
src/qml/qml/qqmldata_p.h
src/qml/qml/qqmlengine_p.h
src/qml/qml/qqmljavascriptexpression.cpp
src/qml/qml/qqmlxmlhttprequest.cpp
src/qml/qml/v4/qv4bindings.cpp
src/qml/qml/v4/qv4irbuilder.cpp
src/qml/qml/v4/qv4jsonobject_p.h
src/qml/qml/v8/qqmlbuiltinfunctions.cpp
src/qml/qml/v8/qv8bindings.cpp
src/qml/qml/v8/qv8contextwrapper.cpp
src/qml/qml/v8/qv8listwrapper.cpp
src/qml/qml/v8/qv8qobjectwrapper.cpp
src/qml/qml/v8/qv8qobjectwrapper_p.h
src/qml/qml/v8/qv8sequencewrapper_p_p.h
src/qml/qml/v8/qv8typewrapper.cpp
src/qml/qml/v8/qv8valuetypewrapper.cpp
src/qml/types/qqmldelegatemodel.cpp
src/quick/items/context2d/qquickcanvasitem.cpp
src/quick/items/context2d/qquickcontext2d.cpp
sync.profile
tests/auto/qml/qjsengine/tst_qjsengine.cpp
tests/benchmarks/qml/animation/animation.pro
tools/qmlprofiler/qmlprofiler.pro
Change-Id: I18a76b8a81d87523247fa03a44ca334b1a2360c9
Diffstat (limited to 'src/quick/items/qquickflickable.cpp')
-rw-r--r-- | src/quick/items/qquickflickable.cpp | 22 |
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 { |