From abad7ffaec282cf77187740743c53eadee52ab74 Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Thu, 24 Aug 2017 13:32:28 +0200 Subject: optimization: get acceptedButtons before checking it twice MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It also makes debugging easier to be able to see this value. Change-Id: I4d68e7561cbc533a6cd3296a3b193732eb7f8d3e Reviewed-by: Jan Arve Sæther --- src/quick/items/qquickwindow.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/quick/items/qquickwindow.cpp') 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; } -- cgit v1.2.3