diff options
| -rw-r--r-- | src/quick/items/items.pri | 1 | ||||
| -rw-r--r-- | src/quick/items/qquickflickable.cpp | 47 | ||||
| -rw-r--r-- | src/quick/items/qquickflickablebehavior_p.h | 105 | ||||
| -rw-r--r-- | src/quick/items/qquickpathview.cpp | 17 |
4 files changed, 108 insertions, 62 deletions
diff --git a/src/quick/items/items.pri b/src/quick/items/items.pri index 3996512f9d..41cdb3526b 100644 --- a/src/quick/items/items.pri +++ b/src/quick/items/items.pri @@ -39,6 +39,7 @@ HEADERS += \ $$PWD/qquickpincharea_p_p.h \ $$PWD/qquickflickable_p.h \ $$PWD/qquickflickable_p_p.h \ + $$PWD/qquickflickablebehavior_p.h \ $$PWD/qquicklistview_p.h \ $$PWD/qquickrepeater_p.h \ $$PWD/qquickrepeater_p_p.h \ diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp index 5b0c1c6756..15627aad84 100644 --- a/src/quick/items/qquickflickable.cpp +++ b/src/quick/items/qquickflickable.cpp @@ -41,6 +41,7 @@ #include "qquickflickable_p.h" #include "qquickflickable_p_p.h" +#include "qquickflickablebehavior_p.h" #include "qquickwindow.h" #include "qquickwindow_p.h" #include "qquickevents_p_p.h" @@ -58,52 +59,6 @@ QT_BEGIN_NAMESPACE -// The maximum number of pixels a flick can overshoot -#ifndef QML_FLICK_OVERSHOOT -#define QML_FLICK_OVERSHOOT 150 -#endif - -// The number of samples to use in calculating the velocity of a flick -#ifndef QML_FLICK_SAMPLEBUFFER -#define QML_FLICK_SAMPLEBUFFER 3 -#endif - -// The number of samples to discard when calculating the flick velocity. -// Touch panels often produce inaccurate results as the finger is lifted. -#ifndef QML_FLICK_DISCARDSAMPLES -#define QML_FLICK_DISCARDSAMPLES 0 -#endif - -// The default maximum velocity of a flick. -#ifndef QML_FLICK_DEFAULTMAXVELOCITY -#define QML_FLICK_DEFAULTMAXVELOCITY 2500 -#endif - -// The default deceleration of a flick. -#ifndef QML_FLICK_DEFAULTDECELERATION -#define QML_FLICK_DEFAULTDECELERATION 1500 -#endif - -// How much faster to decelerate when overshooting -#ifndef QML_FLICK_OVERSHOOTFRICTION -#define QML_FLICK_OVERSHOOTFRICTION 8 -#endif - -// Multiflick acceleration minimum flick velocity threshold -#ifndef QML_FLICK_MULTIFLICK_THRESHOLD -#define QML_FLICK_MULTIFLICK_THRESHOLD 1250 -#endif - -// Multiflick acceleration minimum contentSize/viewSize ratio -#ifndef QML_FLICK_MULTIFLICK_RATIO -#define QML_FLICK_MULTIFLICK_RATIO 10 -#endif - -// Multiflick acceleration maximum velocity multiplier -#ifndef QML_FLICK_MULTIFLICK_MAXBOOST -#define QML_FLICK_MULTIFLICK_MAXBOOST 3.0 -#endif - // FlickThreshold determines how far the "mouse" must have moved // before we perform a flick. static const int FlickThreshold = 15; diff --git a/src/quick/items/qquickflickablebehavior_p.h b/src/quick/items/qquickflickablebehavior_p.h new file mode 100644 index 0000000000..317d6512e6 --- /dev/null +++ b/src/quick/items/qquickflickablebehavior_p.h @@ -0,0 +1,105 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Research In Motion. +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtQml module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QQUICKFLICKABLEBEHAVIOR_H +#define QQUICKFLICKABLEBEHAVIOR_H + +/* ### Platform specific flickable mechanics are defined either here, or in + mkspec files. Long-term (QtQuick 3) Flickable needs to allow such + mechanic details to be controlled via QML so that platforms can easily + load custom behavior at QML compile time. +*/ + +// The maximum number of pixels a flick can overshoot +#ifndef QML_FLICK_OVERSHOOT +#define QML_FLICK_OVERSHOOT 150 +#endif + +// The number of samples to use in calculating the velocity of a flick +#ifndef QML_FLICK_SAMPLEBUFFER +#define QML_FLICK_SAMPLEBUFFER 3 +#endif + +// The number of samples to discard when calculating the flick velocity. +// Touch panels often produce inaccurate results as the finger is lifted. +#ifndef QML_FLICK_DISCARDSAMPLES +#define QML_FLICK_DISCARDSAMPLES 0 +#endif + +// The default maximum velocity of a flick. +#ifndef QML_FLICK_DEFAULTMAXVELOCITY +#ifdef Q_OS_BLACKBERRY +#define QML_FLICK_DEFAULTMAXVELOCITY 10000 +#else +#define QML_FLICK_DEFAULTMAXVELOCITY 2500 +#endif +#endif + +// The default deceleration of a flick. +#ifndef QML_FLICK_DEFAULTDECELERATION +#ifdef Q_OS_BLACKBERRY +#define QML_FLICK_DEFAULTDECELERATION 5000 +#else +#define QML_FLICK_DEFAULTDECELERATION 1500 +#endif +#endif + +// How much faster to decelerate when overshooting +#ifndef QML_FLICK_OVERSHOOTFRICTION +#define QML_FLICK_OVERSHOOTFRICTION 8 +#endif + +// Multiflick acceleration minimum flick velocity threshold +#ifndef QML_FLICK_MULTIFLICK_THRESHOLD +#define QML_FLICK_MULTIFLICK_THRESHOLD 1250 +#endif + +// Multiflick acceleration minimum contentSize/viewSize ratio +#ifndef QML_FLICK_MULTIFLICK_RATIO +#define QML_FLICK_MULTIFLICK_RATIO 10 +#endif + +// Multiflick acceleration maximum velocity multiplier +#ifndef QML_FLICK_MULTIFLICK_MAXBOOST +#define QML_FLICK_MULTIFLICK_MAXBOOST 3.0 +#endif + +#endif //QQUICKFLICKABLEBEHAVIOR_H diff --git a/src/quick/items/qquickpathview.cpp b/src/quick/items/qquickpathview.cpp index 1f41fe04e5..0080f54d20 100644 --- a/src/quick/items/qquickpathview.cpp +++ b/src/quick/items/qquickpathview.cpp @@ -42,6 +42,7 @@ #include "qquickpathview_p.h" #include "qquickpathview_p_p.h" #include "qquickwindow.h" +#include "qquickflickablebehavior_p.h" //Contains flicking behavior defines #include <QtQuick/private/qquickstate_p.h> #include <private/qqmlglobal_p.h> @@ -56,22 +57,6 @@ #include <QtCore/qmath.h> #include <math.h> -// The number of samples to use in calculating the velocity of a flick -#ifndef QML_FLICK_SAMPLEBUFFER -#define QML_FLICK_SAMPLEBUFFER 1 -#endif - -// The number of samples to discard when calculating the flick velocity. -// Touch panels often produce inaccurate results as the finger is lifted. -#ifndef QML_FLICK_DISCARDSAMPLES -#define QML_FLICK_DISCARDSAMPLES 0 -#endif - -// The default maximum velocity of a flick. -#ifndef QML_FLICK_DEFAULTMAXVELOCITY -#define QML_FLICK_DEFAULTMAXVELOCITY 2500 -#endif - QT_BEGIN_NAMESPACE |