diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2012-10-22 19:27:05 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-25 14:10:04 +0200 |
| commit | d58161e749348a9e11e063b1bbb3dbbc0aa46c5e (patch) | |
| tree | 23bf68c4e451fabe22afb437918d146db8ee6b7b /src/widgets/styles/qmacstyle_mac_p.h | |
| parent | 6e908f09dfc19be3cbbf38628c63c348c5172e53 (diff) | |
QMacStyle: make default button animations independent of QWidget
Change-Id: I63c078050288e3151a9c6aad5d4ae28a58afd84f
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Diffstat (limited to 'src/widgets/styles/qmacstyle_mac_p.h')
| -rw-r--r-- | src/widgets/styles/qmacstyle_mac_p.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/widgets/styles/qmacstyle_mac_p.h b/src/widgets/styles/qmacstyle_mac_p.h index 66691c63f7..ec6f7c75b4 100644 --- a/src/widgets/styles/qmacstyle_mac_p.h +++ b/src/widgets/styles/qmacstyle_mac_p.h @@ -160,12 +160,8 @@ public: // Stuff from QAquaAnimate: bool addWidget(QWidget *); - void removeWidget(QWidget *); enum Animates { AquaPushButton, AquaProgressBar, AquaListViewItemOpen, AquaScrollBar }; - bool animatable(Animates, const QObject *) const; - void stopAnimate(Animates, QObject *); - void startAnimate(Animates, QObject *); static ThemeDrawState getDrawState(QStyle::State flags); QAquaWidgetSize aquaSizeConstrain(const QStyleOption *option, const QWidget *widg, QStyle::ContentsType ct = QStyle::CT_CustomBase, @@ -201,7 +197,9 @@ public: QPixmap generateBackgroundPattern() const; public: - QPointer<QPushButton> defaultButton; //default push buttons + mutable QPointer<QObject> pressedButton; + mutable QPointer<QObject> defaultButton; + mutable QPointer<QObject> autoDefaultButton; struct OverlayScrollBarInfo { OverlayScrollBarInfo() |