QmlDesigner: Move StyleAnimator to Utils

StyleAnimator moved to Utils in order to be used by other modules and
styles.
Since Utils is the most common dependency, it's chosen as the right
place of StyleAnimator.

Task-number: QDS-9522
Change-Id: Idbf55875e0c320ccfa21e1c479bf5997ea7d150d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Ali Kianian
2023-03-24 15:24:58 +02:00
parent 4612fb20b5
commit 5644fa1b9c
7 changed files with 23 additions and 16 deletions

View File

@@ -164,6 +164,7 @@ add_qtc_library(Utils
statuslabel.cpp statuslabel.h statuslabel.cpp statuslabel.h
stringtable.cpp stringtable.h stringtable.cpp stringtable.h
stringutils.cpp stringutils.h stringutils.cpp stringutils.h
styleanimator.cpp styleanimator.h
styledbar.cpp styledbar.h styledbar.cpp styledbar.h
stylehelper.cpp stylehelper.h stylehelper.cpp stylehelper.h
tasktree.cpp tasktree.h tasktree.cpp tasktree.h

View File

@@ -3,9 +3,13 @@
#include "styleanimator.h" #include "styleanimator.h"
#include <utils/algorithm.h> #include "algorithm.h"
#include <QPainter>
#include <QStyleOption> #include <QStyleOption>
#include <QWidget>
using namespace Utils;
Animation * StyleAnimator::widgetAnimation(const QWidget *widget) const Animation * StyleAnimator::widgetAnimation(const QWidget *widget) const
{ {

View File

@@ -3,13 +3,17 @@
#pragma once #pragma once
#include "utils_global.h"
#include <QBasicTimer>
#include <QPointer> #include <QPointer>
#include <QTime> #include <QTime>
#include <QBasicTimer>
#include <QStyle>
#include <QPainter>
#include <QWidget> #include <QWidget>
class QPainter;
class QStyleOption;
namespace Utils {
/* /*
* This is a set of helper classes to allow for widget animations in * This is a set of helper classes to allow for widget animations in
* the style. Its mostly taken from Vista style so it should be fully documented * the style. Its mostly taken from Vista style so it should be fully documented
@@ -17,7 +21,7 @@
* *
*/ */
class Animation class QTCREATOR_UTILS_EXPORT Animation
{ {
public : public :
Animation() = default; Animation() = default;
@@ -41,7 +45,7 @@ protected:
}; };
// Handles state transition animations // Handles state transition animations
class Transition : public Animation class QTCREATOR_UTILS_EXPORT Transition : public Animation
{ {
public : public :
Transition() = default; Transition() = default;
@@ -54,7 +58,7 @@ public :
int m_duration = 100; //set time in ms to complete a state transition int m_duration = 100; //set time in ms to complete a state transition
}; };
class StyleAnimator : public QObject class QTCREATOR_UTILS_EXPORT StyleAnimator : public QObject
{ {
Q_OBJECT Q_OBJECT
@@ -70,3 +74,4 @@ private:
QBasicTimer animationTimer; QBasicTimer animationTimer;
QList <Animation*> animations; QList <Animation*> animations;
}; };
}

View File

@@ -293,6 +293,8 @@ Project {
"stringtable.h", "stringtable.h",
"stringutils.cpp", "stringutils.cpp",
"stringutils.h", "stringutils.h",
"styleanimator.cpp",
"styleanimator.h",
"styledbar.cpp", "styledbar.cpp",
"styledbar.h", "styledbar.h",
"stylehelper.cpp", "stylehelper.cpp",

View File

@@ -150,7 +150,6 @@ add_qtc_plugin(Core
sidebar.cpp sidebar.h sidebar.cpp sidebar.h
sidebarwidget.cpp sidebarwidget.h sidebarwidget.cpp sidebarwidget.h
statusbarmanager.cpp statusbarmanager.h statusbarmanager.cpp statusbarmanager.h
styleanimator.cpp styleanimator.h
systemsettings.cpp systemsettings.h systemsettings.cpp systemsettings.h
textdocument.cpp textdocument.h textdocument.cpp textdocument.h
themechooser.cpp themechooser.h themechooser.cpp themechooser.h

View File

@@ -157,8 +157,6 @@ Project {
"sidebarwidget.h", "sidebarwidget.h",
"statusbarmanager.cpp", "statusbarmanager.cpp",
"statusbarmanager.h", "statusbarmanager.h",
"styleanimator.cpp",
"styleanimator.h",
"systemsettings.cpp", "systemsettings.cpp",
"systemsettings.h", "systemsettings.h",
"textdocument.cpp", "textdocument.cpp",

View File

@@ -3,16 +3,14 @@
#include "manhattanstyle.h" #include "manhattanstyle.h"
#include "styleanimator.h"
#include <utils/algorithm.h> #include <utils/algorithm.h>
#include <utils/hostosinfo.h>
#include <utils/stylehelper.h>
#include <utils/fancymainwindow.h> #include <utils/fancymainwindow.h>
#include <utils/hostosinfo.h>
#include <utils/qtcassert.h>
#include <utils/styleanimator.h>
#include <utils/stylehelper.h>
#include <utils/theme/theme.h> #include <utils/theme/theme.h>
#include <utils/utilsicons.h> #include <utils/utilsicons.h>
#include <utils/qtcassert.h>
#include <QApplication> #include <QApplication>
#include <QCheckBox> #include <QCheckBox>