aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/handlers/qquickdragaxis.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/quick/handlers/qquickdragaxis.cpp')
-rw-r--r--src/quick/handlers/qquickdragaxis.cpp72
1 files changed, 30 insertions, 42 deletions
diff --git a/src/quick/handlers/qquickdragaxis.cpp b/src/quick/handlers/qquickdragaxis.cpp
index 88470c8a7d..84b1b7ee07 100644
--- a/src/quick/handlers/qquickdragaxis.cpp
+++ b/src/quick/handlers/qquickdragaxis.cpp
@@ -1,50 +1,16 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtQuick 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 The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/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 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2017 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
#include "qquickdragaxis_p.h"
+#include "qquickpointerhandler_p.h"
+#include <QtQuick/qquickitem.h>
#include <limits>
QT_BEGIN_NAMESPACE
-QQuickDragAxis::QQuickDragAxis()
- : m_minimum(-std::numeric_limits<qreal>::max())
- , m_maximum(std::numeric_limits<qreal>::max())
- , m_enabled(true)
+Q_LOGGING_CATEGORY(lcDragAxis, "qt.quick.pointer.dragaxis")
+
+QQuickDragAxis::QQuickDragAxis(QQuickPointerHandler *handler, const QString &propertyName, qreal initValue)
+ : QObject(handler), m_accumulatedValue(initValue), m_propertyName(propertyName)
{
}
@@ -75,4 +41,26 @@ void QQuickDragAxis::setEnabled(bool enabled)
emit enabledChanged();
}
+void QQuickDragAxis::onActiveChanged(bool active, qreal initActiveValue)
+{
+ m_activeValue = initActiveValue;
+ m_startValue = m_accumulatedValue;
+ qCDebug(lcDragAxis) << parent() << m_propertyName << active << ": init active" << m_activeValue
+ << "target start" << m_startValue;
+}
+
+void QQuickDragAxis::updateValue(qreal activeValue, qreal accumulatedValue, qreal delta)
+{
+ if (!m_enabled)
+ return;
+
+ m_activeValue = activeValue;
+ m_accumulatedValue = qBound(m_minimum, accumulatedValue, m_maximum);
+ qCDebug(lcDragAxis) << parent() << m_propertyName << "values: active" << activeValue
+ << "accumulated" << m_accumulatedValue << "delta" << delta;
+ emit activeValueChanged(delta);
+}
+
QT_END_NAMESPACE
+
+#include "moc_qquickdragaxis_p.cpp"