diff options
Diffstat (limited to 'src/gui/statemachine/qkeyeventtransition.cpp')
-rw-r--r-- | src/gui/statemachine/qkeyeventtransition.cpp | 43 |
1 files changed, 23 insertions, 20 deletions
diff --git a/src/gui/statemachine/qkeyeventtransition.cpp b/src/gui/statemachine/qkeyeventtransition.cpp index 88e4add..e6ab11b 100644 --- a/src/gui/statemachine/qkeyeventtransition.cpp +++ b/src/gui/statemachine/qkeyeventtransition.cpp @@ -11,6 +11,7 @@ #include "qkeyeventtransition.h" #include "qbasickeyeventtransition_p.h" +#include <QtCore/qwrappedevent.h> #if defined(QT_EXPERIMENTAL_SOLUTION) # include "qeventtransition_p.h" @@ -39,6 +40,12 @@ QT_BEGIN_NAMESPACE \brief the key that this key event transition is associated with */ +/*! + \property QKeyEventTransition::modifiersMask + + \brief the keyboard modifiers mask that this key event transition checks for +*/ + class QKeyEventTransitionPrivate : public QEventTransitionPrivate { Q_DECLARE_PUBLIC(QKeyEventTransition) @@ -111,32 +118,23 @@ void QKeyEventTransition::setKey(int key) } /*! - Returns the keyboard modifiers that this key event transition checks for. + Returns the keyboard modifiers mask that this key event transition checks + for. */ -Qt::KeyboardModifiers QKeyEventTransition::modifiers() const +Qt::KeyboardModifiers QKeyEventTransition::modifiersMask() const { Q_D(const QKeyEventTransition); - return d->transition->modifiers(); + return d->transition->modifiersMask(); } /*! - Sets the keyboard \a modifiers that this key event transition will check - for. + Sets the keyboard \a modifiers mask that this key event transition will + check for. */ -void QKeyEventTransition::setModifiers(Qt::KeyboardModifiers modifiers) +void QKeyEventTransition::setModifiersMask(Qt::KeyboardModifiers modifiersMask) { Q_D(QKeyEventTransition); - d->transition->setModifiers(modifiers); -} - -/*! - \reimp -*/ -bool QKeyEventTransition::testEventCondition(QEvent *event) const -{ - Q_D(const QKeyEventTransition); - d->transition->setEventType(event->type()); - return QAbstractTransitionPrivate::get(d->transition)->callEventTest(event); + d->transition->setModifiersMask(modifiersMask); } /*! @@ -144,15 +142,20 @@ bool QKeyEventTransition::testEventCondition(QEvent *event) const */ bool QKeyEventTransition::eventTest(QEvent *event) const { - return QEventTransition::eventTest(event); + Q_D(const QKeyEventTransition); + if (!QEventTransition::eventTest(event)) + return false; + QWrappedEvent *we = static_cast<QWrappedEvent*>(event); + d->transition->setEventType(we->event()->type()); + return QAbstractTransitionPrivate::get(d->transition)->callEventTest(we->event()); } /*! \reimp */ -void QKeyEventTransition::onTransition() +void QKeyEventTransition::onTransition(QEvent *event) { - QEventTransition::onTransition(); + QEventTransition::onTransition(event); } QT_END_NAMESPACE |