summaryrefslogtreecommitdiffstats
path: root/src/widgets/styles/qwindowsstyle_p.h
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@digia.com>2012-10-05 10:42:10 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-10-16 15:29:15 +0200
commit7501d55ae005cf9a155a6bcbeac468bfde40177d (patch)
tree2247bea576be9e45b241e50c1db33532211c7f0d /src/widgets/styles/qwindowsstyle_p.h
parente437051ff51d57bcc6937dc23fe6a77bf9897130 (diff)
Introduce (private) QStyleAnimation
QStyleAnimation handles style animations in a generic fashion by sending StyleAnimationUpdate events back to the animation target instead of calling QWidget::update() directly. This decouples style animations from widgets and makes it possible to run style animations for QQuickItems (ie. the desktop components). The next step is to add "QObject* QStyleOption::target" and use that everywhere instead of the widget pointer passed to various QStyle methods. Change-Id: Ib963c54872805fc3f0123ff922f82c9962a68b90 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Diffstat (limited to 'src/widgets/styles/qwindowsstyle_p.h')
-rw-r--r--src/widgets/styles/qwindowsstyle_p.h10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/widgets/styles/qwindowsstyle_p.h b/src/widgets/styles/qwindowsstyle_p.h
index 0cf53b9903..f24696f0bd 100644
--- a/src/widgets/styles/qwindowsstyle_p.h
+++ b/src/widgets/styles/qwindowsstyle_p.h
@@ -59,7 +59,6 @@
#ifndef QT_NO_STYLE_WINDOWS
#include <qlist.h>
#include <qhash.h>
-#include <qelapsedtimer.h>
QT_BEGIN_NAMESPACE
@@ -71,19 +70,14 @@ class QWindowsStylePrivate : public QCommonStylePrivate
Q_DECLARE_PUBLIC(QWindowsStyle)
public:
QWindowsStylePrivate();
- void startAnimation(QObject *o, QProgressBar *bar);
- void stopAnimation(QObject *o, QProgressBar *bar);
+ void startProgressAnimation(QObject *o, QProgressBar *bar);
+ void stopProgressAnimation(QObject *o, QProgressBar *bar);
bool hasSeenAlt(const QWidget *widget) const;
bool altDown() const { return alt_down; }
bool alt_down;
QList<const QWidget *> seenAlt;
int menuBarTimer;
- QList<QProgressBar *> animatedProgressBars;
- int animationFps;
- int animateTimer;
- QElapsedTimer startTime;
- int animateStep;
QColor inactiveCaptionText;
QColor activeCaptionColor;
QColor activeGradientCaptionColor;