aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/fusion/qquickfusionknob.cpp
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@qt.io>2020-03-27 11:17:35 +0100
committerMitch Curtis <mitch.curtis@qt.io>2020-08-26 11:45:57 +0200
commit5246dd2de211ffb81313a5c29ae7894545a28c43 (patch)
treeeedd1652642e519ccd8603612378eb5c0bfdca83 /src/imports/controls/fusion/qquickfusionknob.cpp
parent9aafea810b8867fb31f9ec27a238628467e7ab56 (diff)
Register C++ types declaratively
Adapt to the new way of registering C++ types. The types need to be seen at compile time so that code can be generated that invokes them. This patch: - Adds QML_* macros where applicable. - Adapts the build system files to the new way of registering modules. - Splits up the QtQuick.Controls[.*].impl files into their own plugins, as we can only register one QML module per .pro file. - Removes C++ type registration calls in every plugin. - Moves private types from src/quickcontrols2/quickcontrols2.pro to src/quickcontrols2/impl/quickcontrols2-impl.pro. Some of these types need to be exposed to QML, but quickcontrols2.pro is already in use to declare the QtQuick.Controls import (and also provides the public C++ QQuickStyle API), and the new QML_IMPORT_NAME/VERSION syntax only allows one module per project. As some of the types that need to be exposed to QML are also referenced by some C++ code (e.g. tests, etc.), we just move all of the private types to the new library. Follow-up patches will register the QML types declaratively. Task-number: QTBUG-82922 Change-Id: Iaf9ee106237d61701d57a8896f3822304c8151a6 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/imports/controls/fusion/qquickfusionknob.cpp')
-rw-r--r--src/imports/controls/fusion/qquickfusionknob.cpp88
1 files changed, 0 insertions, 88 deletions
diff --git a/src/imports/controls/fusion/qquickfusionknob.cpp b/src/imports/controls/fusion/qquickfusionknob.cpp
deleted file mode 100644
index a641d190..00000000
--- a/src/imports/controls/fusion/qquickfusionknob.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** 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 http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://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.LGPLv3 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.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 later 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 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qquickfusionknob_p.h"
-
-#include <QtCore/qmath.h>
-#include <QtGui/qpainter.h>
-#include <QtQuick/private/qquickpalette_p.h>
-#include <QtQuick/private/qquickitem_p.h>
-
-QT_BEGIN_NAMESPACE
-
-QQuickFusionKnob::QQuickFusionKnob(QQuickItem *parent)
- : QQuickPaintedItem(parent)
-{
- connect(this, &QQuickItem::paletteChanged, this, [this](){ update(); });
-}
-
-// extracted from QStyleHelper::drawDial()
-void QQuickFusionKnob::paint(QPainter *painter)
-{
- const qreal w = width();
- const qreal h = height();
- if (w <= 0 || h <= 0)
- return;
-
- QColor color = QQuickItemPrivate::get(this)->palette()->button();
- color.setHsv(color.hue(),
- qMin(140, color .saturation()),
- qMax(180, color.value()));
- color = color.lighter(104);
- color.setAlphaF(qreal(0.8));
-
- const qreal sz = qMin(w, h);
- QRectF rect(0, 0, sz, sz);
- rect.moveCenter(QPointF(w / 2.0, h / 2.0));
- const QPointF center = rect.center();
-
- QRadialGradient gradient(center.x() + rect.width() / 2,
- center.y() + rect.width(),
- rect.width() * 2,
- center.x(), center.y());
- gradient.setColorAt(1, color.darker(140));
- gradient.setColorAt(qreal(0.4), color.darker(120));
- gradient.setColorAt(0, color.darker(110));
-
- painter->setRenderHint(QPainter::Antialiasing);
- painter->setBrush(gradient);
- painter->setPen(QColor(255, 255, 255, 150));
- painter->drawEllipse(rect);
- painter->setPen(QColor(0, 0, 0, 80));
- painter->drawEllipse(rect.adjusted(1, 1, -1, -1));
-}
-
-QT_END_NAMESPACE