diff options
| author | jasplin <qt-info@nokia.com> | 2009-04-30 09:30:51 (GMT) |
|---|---|---|
| committer | jasplin <qt-info@nokia.com> | 2009-04-30 10:05:28 (GMT) |
| commit | db6f14776a298201e68e1d3646bb99b740c12867 (patch) | |
| tree | 712d537f15b7aeb0e29daf611db8e9aa317c7d4d /src/gui | |
| parent | c70eae8288cccb92e54e3c73f0ca257af033178a (diff) | |
| download | Qt-db6f14776a298201e68e1d3646bb99b740c12867.zip Qt-db6f14776a298201e68e1d3646bb99b740c12867.tar.gz Qt-db6f14776a298201e68e1d3646bb99b740c12867.tar.bz2 | |
Fixed busy indicator for a QProgressBar with a style sheet applied to it.
For a progress bar with a style sheet applied to it, this
fix ensures that the timer event is passed to the event
handler that updates the busy indicator animation state.
Essentially, the bug was that the decision that the
event was processed by the proxy style object (baseStyle())
was based only on the return value from the event() function.
In this case it is necessary to check that the event was
accepted as well.
Reviewed-by: ogoffart
Reviewed-by: brad
Task-number: 252283
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/styles/qstylesheetstyle.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/styles/qstylesheetstyle.cpp b/src/gui/styles/qstylesheetstyle.cpp index 49ac57a..058660e 100644 --- a/src/gui/styles/qstylesheetstyle.cpp +++ b/src/gui/styles/qstylesheetstyle.cpp @@ -5842,7 +5842,7 @@ QRect QStyleSheetStyle::subElementRect(SubElement se, const QStyleOption *opt, c bool QStyleSheetStyle::event(QEvent *e) { - return baseStyle()->event(e) || ParentStyle::event(e); + return (baseStyle()->event(e) && e->isAccepted()) || ParentStyle::event(e); } void QStyleSheetStyle::updateStyleSheetFont(QWidget* w) const |