Skip to content

Q
qgroundcontrol
Commit f3a77dbb authored by Don Gagne's avatar Don Gagne
Browse files
Options

Better variable names 

Also realized I don’t need __lastMouseXY
parent 9f4b6e76
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 10 deletions
src/QmlControls/QGCButton.qml
View file @ f3a77dbb
...@@ -20,22 +20,20 @@ Button { ...@@ -20,22 +20,20 @@ Button {
property bool __forceHoverOff: false property bool __forceHoverOff: false
property int __lastMouseX: __behavior.mouseX property int __lastGlobalMouseX: 0
property int __lastMouseY: __behavior.mouseY property int __lastGlobalMouseY: 0
property int __lastCursorX: 0
property int __lastCursorY: 0
property MousePosition __mousePosition: MousePosition { } property MousePosition __globalMousePosition: MousePosition { }
Connections { Connections {
target: __behavior target: __behavior
onMouseXChanged: { onMouseXChanged: {
__lastCursorX = __mousePosition.mouseX __lastGlobalMouseX = __globalMousePosition.mouseX
__lastCursorY = __mousePosition.mouseY __lastGlobalMouseY = __globalMousePosition.mouseY
} }
onMouseYChanged: { onMouseYChanged: {
__lastCursorX = __mousePosition.mouseX __lastGlobalMouseX = __globalMousePosition.mouseX
__lastCursorY = __mousePosition.mouseY __lastGlobalMouseY = __globalMousePosition.mouseY
} }
onEntered: { __forceHoverOff; false; hoverTimer.start() } onEntered: { __forceHoverOff; false; hoverTimer.start() }
onExited: { __forceHoverOff; false; hoverTimer.stop() } onExited: { __forceHoverOff; false; hoverTimer.stop() }
...@@ -47,7 +45,7 @@ Button { ...@@ -47,7 +45,7 @@ Button {
repeat: true repeat: true
onTriggered: { onTriggered: {
if (__lastCursorX != __mousePosition.mouseX || __lastCursorY != __mousePosition.mouseY) { if (__lastGlobalMouseX != __globalMousePosition.mouseX || __lastGlobalMouseY != __globalMousePosition.mouseY) {
__forceHoverOff = true __forceHoverOff = true
} else { } else {
__forceHoverOff = false __forceHoverOff = false
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment