From f3a77dbb4b7e8dbf7c08c5d9b49e94b337c398ac Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Fri, 6 Mar 2015 18:22:46 -0800 Subject: [PATCH] Better variable names MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also realized I don’t need __lastMouseXY --- src/QmlControls/QGCButton.qml | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/QmlControls/QGCButton.qml b/src/QmlControls/QGCButton.qml index e48c93dbb..a3d31b267 100644 --- a/src/QmlControls/QGCButton.qml +++ b/src/QmlControls/QGCButton.qml @@ -20,22 +20,20 @@ Button { property bool __forceHoverOff: false - property int __lastMouseX: __behavior.mouseX - property int __lastMouseY: __behavior.mouseY - property int __lastCursorX: 0 - property int __lastCursorY: 0 + property int __lastGlobalMouseX: 0 + property int __lastGlobalMouseY: 0 - property MousePosition __mousePosition: MousePosition { } + property MousePosition __globalMousePosition: MousePosition { } Connections { target: __behavior onMouseXChanged: { - __lastCursorX = __mousePosition.mouseX - __lastCursorY = __mousePosition.mouseY + __lastGlobalMouseX = __globalMousePosition.mouseX + __lastGlobalMouseY = __globalMousePosition.mouseY } onMouseYChanged: { - __lastCursorX = __mousePosition.mouseX - __lastCursorY = __mousePosition.mouseY + __lastGlobalMouseX = __globalMousePosition.mouseX + __lastGlobalMouseY = __globalMousePosition.mouseY } onEntered: { __forceHoverOff; false; hoverTimer.start() } onExited: { __forceHoverOff; false; hoverTimer.stop() } @@ -47,7 +45,7 @@ Button { repeat: true onTriggered: { - if (__lastCursorX != __mousePosition.mouseX || __lastCursorY != __mousePosition.mouseY) { + if (__lastGlobalMouseX != __globalMousePosition.mouseX || __lastGlobalMouseY != __globalMousePosition.mouseY) { __forceHoverOff = true } else { __forceHoverOff = false -- 2.22.0