From f8b423ced6c8f67c3ddf7e3ee2e9f4babf8455f7 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 24 Oct 2014 16:12:15 -0700 Subject: [PATCH] bubble up isAutoRepeat state for KeyEvent --- libraries/script-engine/src/EventTypes.cpp | 12 +++++++++--- libraries/script-engine/src/EventTypes.h | 1 + 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/libraries/script-engine/src/EventTypes.cpp b/libraries/script-engine/src/EventTypes.cpp index 75b3eba1a3..de3ec231ae 100644 --- a/libraries/script-engine/src/EventTypes.cpp +++ b/libraries/script-engine/src/EventTypes.cpp @@ -30,7 +30,8 @@ KeyEvent::KeyEvent() : isMeta(false), isAlt(false), isKeypad(false), - isValid(false) + isValid(false), + isAutoRepeat(false) { }; @@ -44,6 +45,7 @@ KeyEvent::KeyEvent(const QKeyEvent& event) { isAlt = event.modifiers().testFlag(Qt::AltModifier); isKeypad = event.modifiers().testFlag(Qt::KeypadModifier); isValid = true; + isAutoRepeat = event.isAutoRepeat(); // handle special text for special characters... if (key == Qt::Key_F1) { @@ -127,7 +129,8 @@ bool KeyEvent::operator==(const KeyEvent& other) const { && other.isControl == isControl && other.isMeta == isMeta && other.isAlt == isAlt - && other.isKeypad == isKeypad; + && other.isKeypad == isKeypad + && other.isAutoRepeat == isAutoRepeat; } @@ -163,6 +166,7 @@ QScriptValue keyEventToScriptValue(QScriptEngine* engine, const KeyEvent& event) obj.setProperty("isControl", event.isControl); obj.setProperty("isAlt", event.isAlt); obj.setProperty("isKeypad", event.isKeypad); + obj.setProperty("isAutoRepeat", event.isAutoRepeat); return obj; } @@ -173,6 +177,7 @@ void keyEventFromScriptValue(const QScriptValue& object, KeyEvent& event) { event.isControl = object.property("isControl").toVariant().toBool(); event.isAlt = object.property("isAlt").toVariant().toBool(); event.isKeypad = object.property("isKeypad").toVariant().toBool(); + event.isAutoRepeat = object.property("isAutoRepeat").toVariant().toBool(); QScriptValue key = object.property("key"); if (key.isValid()) { @@ -286,7 +291,8 @@ void keyEventFromScriptValue(const QScriptValue& object, KeyEvent& event) { << " event.isControl=" << event.isControl << " event.isMeta=" << event.isMeta << " event.isAlt=" << event.isAlt - << " event.isKeypad=" << event.isKeypad; + << " event.isKeypad=" << event.isKeypad + << " event.isAutoRepeat=" << event.isAutoRepeat; } } diff --git a/libraries/script-engine/src/EventTypes.h b/libraries/script-engine/src/EventTypes.h index 7d4076dbf0..959292039b 100644 --- a/libraries/script-engine/src/EventTypes.h +++ b/libraries/script-engine/src/EventTypes.h @@ -38,6 +38,7 @@ public: bool isAlt; bool isKeypad; bool isValid; + bool isAutoRepeat; };