fix right mouse click

This commit is contained in:
ZappoMan 2014-02-19 11:33:43 -08:00
parent 897da67118
commit 3bec67ecfd

View file

@ -262,10 +262,17 @@ MouseEvent::MouseEvent() :
}; };
MouseEvent::MouseEvent(const QMouseEvent& event) { MouseEvent::MouseEvent(const QMouseEvent& event) :
x = event.x(); x(event.x()),
y = event.y(); y(event.y()),
isLeftButton(event.buttons().testFlag(Qt::LeftButton)),
isRightButton(event.buttons().testFlag(Qt::RightButton)),
isMiddleButton(event.buttons().testFlag(Qt::MiddleButton)),
isShifted(event.modifiers().testFlag(Qt::ShiftModifier)),
isControl(event.modifiers().testFlag(Qt::ControlModifier)),
isMeta(event.modifiers().testFlag(Qt::MetaModifier)),
isAlt(event.modifiers().testFlag(Qt::AltModifier))
{
// single button that caused the event // single button that caused the event
switch (event.button()) { switch (event.button()) {
case Qt::LeftButton: case Qt::LeftButton:
@ -284,16 +291,6 @@ MouseEvent::MouseEvent(const QMouseEvent& event) {
button = "NONE"; button = "NONE";
break; break;
} }
// button pressed state
isLeftButton = isLeftButton || (event.buttons().testFlag(Qt::LeftButton));
isRightButton = isRightButton || (event.buttons().testFlag(Qt::RightButton));
isMiddleButton = isMiddleButton || (event.buttons().testFlag(Qt::MiddleButton));
// keyboard modifiers
isShifted = event.modifiers().testFlag(Qt::ShiftModifier);
isMeta = event.modifiers().testFlag(Qt::MetaModifier);
isControl = event.modifiers().testFlag(Qt::ControlModifier);
isAlt = event.modifiers().testFlag(Qt::AltModifier);
} }
QScriptValue mouseEventToScriptValue(QScriptEngine* engine, const MouseEvent& event) { QScriptValue mouseEventToScriptValue(QScriptEngine* engine, const MouseEvent& event) {