diff options
Diffstat (limited to 'examples/widgets/animation')
| -rw-r--r-- | examples/widgets/animation/easing/CMakeLists.txt | 32 | ||||
| -rw-r--r-- | examples/widgets/animation/easing/animation.h | 4 | ||||
| -rw-r--r-- | examples/widgets/animation/easing/main.cpp | 1 | ||||
| -rw-r--r-- | examples/widgets/animation/easing/window.cpp | 18 | ||||
| -rw-r--r-- | examples/widgets/animation/easing/window.h | 5 |
5 files changed, 32 insertions, 28 deletions
diff --git a/examples/widgets/animation/easing/CMakeLists.txt b/examples/widgets/animation/easing/CMakeLists.txt index d3667cd725..8398f7d3e0 100644 --- a/examples/widgets/animation/easing/CMakeLists.txt +++ b/examples/widgets/animation/easing/CMakeLists.txt @@ -4,17 +4,10 @@ cmake_minimum_required(VERSION 3.16) project(easing LANGUAGES CXX) -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTOUIC ON) - -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/animation/easing") - find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) +qt_standard_project_setup() + qt_add_executable(easing animation.h form.ui @@ -27,10 +20,10 @@ set_target_properties(easing PROPERTIES MACOSX_BUNDLE TRUE ) -target_link_libraries(easing PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets +target_link_libraries(easing PRIVATE + Qt6::Core + Qt6::Gui + Qt6::Widgets ) # Resources: @@ -46,7 +39,14 @@ qt_add_resources(easing "easing" ) install(TARGETS easing - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION . + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +) + +qt_generate_deploy_app_script( + TARGET easing + OUTPUT_SCRIPT deploy_script + NO_UNSUPPORTED_PLATFORM_ERROR ) +install(SCRIPT ${deploy_script}) diff --git a/examples/widgets/animation/easing/animation.h b/examples/widgets/animation/easing/animation.h index b6b4824583..111ad44f45 100644 --- a/examples/widgets/animation/easing/animation.h +++ b/examples/widgets/animation/easing/animation.h @@ -15,8 +15,8 @@ public: CirclePath, NPathTypes }; - Animation(QObject *target, const QByteArray &prop) - : QPropertyAnimation(target, prop) + Animation(QObject *target, const QByteArray &prop, QObject *parent = nullptr) + : QPropertyAnimation(target, prop, parent) { setPathType(LinearPath); } diff --git a/examples/widgets/animation/easing/main.cpp b/examples/widgets/animation/easing/main.cpp index a1c01698d1..26009a6bf7 100644 --- a/examples/widgets/animation/easing/main.cpp +++ b/examples/widgets/animation/easing/main.cpp @@ -6,7 +6,6 @@ int main(int argc, char **argv) { - Q_INIT_RESOURCE(easing); QApplication app(argc, argv); Window w; diff --git a/examples/widgets/animation/easing/window.cpp b/examples/widgets/animation/easing/window.cpp index 260efa7832..d926efc537 100644 --- a/examples/widgets/animation/easing/window.cpp +++ b/examples/widgets/animation/easing/window.cpp @@ -35,14 +35,14 @@ Window::Window(QWidget *parent) m_scene.addItem(m_item); m_ui.graphicsView->setScene(&m_scene); - m_anim = new Animation(m_item, "pos"); + m_anim = new Animation(m_item, "pos", this); m_anim->setEasingCurve(QEasingCurve::OutBounce); m_ui.easingCurvePicker->setCurrentRow(int(QEasingCurve::OutBounce)); startAnimation(); } -QEasingCurve createEasingCurve(QEasingCurve::Type curveType) +static QEasingCurve createEasingCurve(QEasingCurve::Type curveType) { QEasingCurve curve(curveType); @@ -72,12 +72,12 @@ void Window::createCurveIcons() // Skip QEasingCurve::Custom for (int i = 0; i < QEasingCurve::NCurveTypes - 1; ++i) { painter.fillRect(QRect(QPoint(0, 0), m_iconSize), brush); - QEasingCurve curve = createEasingCurve((QEasingCurve::Type) i); + QEasingCurve curve = createEasingCurve(static_cast<QEasingCurve::Type>(i)); painter.setPen(QColor(0, 0, 255, 64)); qreal xAxis = m_iconSize.height()/1.5; qreal yAxis = m_iconSize.width()/3; - painter.drawLine(0, xAxis, m_iconSize.width(), xAxis); - painter.drawLine(yAxis, 0, yAxis, m_iconSize.height()); + painter.drawLine(QLineF(0, xAxis, m_iconSize.width(), xAxis)); + painter.drawLine(QLineF(yAxis, 0, yAxis, m_iconSize.height())); qreal curveScale = m_iconSize.height()/2; @@ -85,18 +85,18 @@ void Window::createCurveIcons() // start point painter.setBrush(Qt::red); - QPoint start(yAxis, xAxis - curveScale * curve.valueForProgress(0)); + QPoint start(qRound(yAxis), qRound(xAxis - curveScale * curve.valueForProgress(0))); painter.drawRect(start.x() - 1, start.y() - 1, 3, 3); // end point painter.setBrush(Qt::blue); - QPoint end(yAxis + curveScale, xAxis - curveScale * curve.valueForProgress(1)); + QPoint end(qRound(yAxis + curveScale), qRound(xAxis - curveScale * curve.valueForProgress(1))); painter.drawRect(end.x() - 1, end.y() - 1, 3, 3); QPainterPath curvePath; curvePath.moveTo(start); for (qreal t = 0; t <= 1.0; t+=1.0/curveScale) { - QPoint to; + QPointF to; to.setX(yAxis + curveScale * t); to.setY(xAxis - curveScale * curve.valueForProgress(t)); curvePath.lineTo(to); @@ -122,7 +122,7 @@ void Window::startAnimation() void Window::curveChanged(int row) { - QEasingCurve::Type curveType = (QEasingCurve::Type)row; + QEasingCurve::Type curveType = static_cast<QEasingCurve::Type>(row); m_anim->setEasingCurve(createEasingCurve(curveType)); m_anim->setCurrentTime(0); diff --git a/examples/widgets/animation/easing/window.h b/examples/widgets/animation/easing/window.h index b454d1853f..ea6bb74667 100644 --- a/examples/widgets/animation/easing/window.h +++ b/examples/widgets/animation/easing/window.h @@ -1,6 +1,9 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +#ifndef WINDOW_H +#define WINDOW_H + #include <QtWidgets> #include "ui_form.h" @@ -37,3 +40,5 @@ private: Animation *m_anim; QSize m_iconSize; }; + +#endif // WINDOW_H |