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/widgets | |
| 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/widgets')
| -rw-r--r-- | src/widgets/widgets/qabstractbutton.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/widgets/qpushbutton.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/widgets/widgets/qabstractbutton.cpp b/src/widgets/widgets/qabstractbutton.cpp index 5d879c8930..eba63045fe 100644 --- a/src/widgets/widgets/qabstractbutton.cpp +++ b/src/widgets/widgets/qabstractbutton.cpp @@ -1113,6 +1113,8 @@ void QAbstractButton::mouseReleaseEvent(QMouseEvent *e) } if (!d->down) { + // refresh is required by QMacStyle to resume the default button animation + d->refresh(); e->ignore(); return; } diff --git a/src/widgets/widgets/qpushbutton.cpp b/src/widgets/widgets/qpushbutton.cpp index 5e8d7d16bd..0aeec551d6 100644 --- a/src/widgets/widgets/qpushbutton.cpp +++ b/src/widgets/widgets/qpushbutton.cpp @@ -329,7 +329,7 @@ void QPushButton::initStyleOption(QStyleOptionButton *option) const if (d->menu) option->features |= QStyleOptionButton::HasMenu; #endif - if (autoDefault() || d->defaultButton) + if (autoDefault()) option->features |= QStyleOptionButton::AutoDefaultButton; if (d->defaultButton) option->features |= QStyleOptionButton::DefaultButton; |