From 8f9346dd663d65f5030d4fb590564a8661a634d8 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Thu, 4 Oct 2012 15:30:09 +0200 Subject: Add QEvent::StyleAnimationUpdate: style animation target should update The event will be sent from the upcoming style animations. This change merely introduces the new event type and makes both QWidget and QGraphicsWidget call update() upon receiving the event. Change-Id: I69bb4d05bacb22f7e3a2512cae68848801e4f4d7 Reviewed-by: Jens Bache-Wiig --- src/corelib/kernel/qcoreevent.cpp | 1 + src/corelib/kernel/qcoreevent.h | 2 ++ src/widgets/graphicsview/qgraphicswidget.cpp | 1 + src/widgets/kernel/qwidget.cpp | 3 +++ 4 files changed, 7 insertions(+) diff --git a/src/corelib/kernel/qcoreevent.cpp b/src/corelib/kernel/qcoreevent.cpp index 231e7f34cd..71690ba90b 100644 --- a/src/corelib/kernel/qcoreevent.cpp +++ b/src/corelib/kernel/qcoreevent.cpp @@ -262,6 +262,7 @@ QT_BEGIN_NAMESPACE \omitvalue ShowWindowRequest \omitvalue Speech \omitvalue Style + \omitvalue StyleAnimationUpdate \omitvalue ZeroTimerEvent \omitvalue ApplicationActivated \omitvalue ApplicationDeactivated diff --git a/src/corelib/kernel/qcoreevent.h b/src/corelib/kernel/qcoreevent.h index 98dde37e3a..d30f93f9f3 100644 --- a/src/corelib/kernel/qcoreevent.h +++ b/src/corelib/kernel/qcoreevent.h @@ -279,6 +279,8 @@ public: PlatformPanel = 212, + StyleAnimationUpdate = 213, // style animation target should be updated + // 512 reserved for Qt Jambi's MetaCall event // 513 reserved for Qt Jambi's DeleteOnMainThread event diff --git a/src/widgets/graphicsview/qgraphicswidget.cpp b/src/widgets/graphicsview/qgraphicswidget.cpp index cc8ea47e7e..05ae51c630 100644 --- a/src/widgets/graphicsview/qgraphicswidget.cpp +++ b/src/widgets/graphicsview/qgraphicswidget.cpp @@ -1408,6 +1408,7 @@ bool QGraphicsWidget::event(QEvent *event) break; case QEvent::WindowActivate: case QEvent::WindowDeactivate: + case QEvent::StyleAnimationUpdate: update(); break; // Taken from QWidget::event diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index ffcaa15527..fa055bb210 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -8142,6 +8142,9 @@ bool QWidget::event(QEvent *event) case QEvent::UpdateLater: update(static_cast(event)->region()); break; + case QEvent::StyleAnimationUpdate: + update(); + break; case QEvent::WindowBlocked: case QEvent::WindowUnblocked: -- cgit v1.2.3