diff options
author | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-08-24 13:32:28 +0200 |
---|---|---|
committer | Jan Arve Sæther <jan-arve.saether@qt.io> | 2017-08-25 14:13:33 +0000 |
commit | abad7ffaec282cf77187740743c53eadee52ab74 (patch) | |
tree | eb97baf6eccdf71cde7be181e52def556af5f494 | |
parent | ff085e2591e8257c373db1c52475b9b54c3da56b (diff) |
optimization: get acceptedButtons before checking it twice
It also makes debugging easier to be able to see this value.
Change-Id: I4d68e7561cbc533a6cd3296a3b193732eb7f8d3e
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
-rw-r--r-- | src/quick/items/qquickwindow.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index 44bcda027f..e5583cfd3b 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -1678,8 +1678,9 @@ void QQuickWindowPrivate::deliverMouseEvent(QQuickPointerMouseEvent *pointerEven // if the grabber is an Item: // if the update consists of changing button state, don't accept it unless // the button is one in which the grabber is interested - if (pointerEvent->button() != Qt::NoButton && grabber->acceptedMouseButtons() - && !(grabber->acceptedMouseButtons() & pointerEvent->button())) { + Qt::MouseButtons acceptedButtons = grabber->acceptedMouseButtons(); + if (pointerEvent->button() != Qt::NoButton && acceptedButtons + && !(acceptedButtons & pointerEvent->button())) { pointerEvent->setAccepted(false); return; } |