From 5cf65f9fe1b1c612cba8d42a80fd058bd37e013e Mon Sep 17 00:00:00 2001 From: dogmaphobic Date: Sat, 7 Mar 2015 12:19:46 -0500 Subject: [PATCH] Grrr.. Mistyped it. --- src/QmlControls/QGCButton.qml | 6 +++--- src/QmlControls/QGCToolBarButton.qml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/QmlControls/QGCButton.qml b/src/QmlControls/QGCButton.qml index ee57ffd02..a3d31b267 100644 --- a/src/QmlControls/QGCButton.qml +++ b/src/QmlControls/QGCButton.qml @@ -12,7 +12,7 @@ Button { property var __qgcPal: QGCPalette { colorGroupEnabled: enabled } - property bool __showHighLight: (pressed | hovered | checked) && !__forceHoverOff + property bool __showHighlight: (pressed | hovered | checked) && !__forceHoverOff // This fixes the issue with button hover where if a Button is near the edge oa QQuickWidget you can // move the mouse fast enough such that the MouseArea does not trigger an onExited. This is turn @@ -70,7 +70,7 @@ Button { Rectangle { anchors.fill: parent - color: __showHighLight ? + color: __showHighlight ? control.__qgcPal.buttonHighlight : (primary ? control.__qgcPal.primaryButton : control.__qgcPal.button) } @@ -107,7 +107,7 @@ Button { renderType: Text.NativeRendering anchors.verticalCenter: parent.verticalCenter text: control.text - color: __showHighLight ? + color: __showHighlight ? control.__qgcPal.buttonHighlightText : (primary ? control.__qgcPal.primaryButtonText : control.__qgcPal.buttonText) } diff --git a/src/QmlControls/QGCToolBarButton.qml b/src/QmlControls/QGCToolBarButton.qml index 8d228a13d..0bfa18140 100644 --- a/src/QmlControls/QGCToolBarButton.qml +++ b/src/QmlControls/QGCToolBarButton.qml @@ -10,7 +10,7 @@ QGCButton { id: button property bool repaintChevron: false property var __qgcPal: QGCPalette { colorGroupEnabled: enabled } - property bool showHighlight: __showHighLight + property bool showHighlight: __showHighlight style: ButtonStyle { background: Item { anchors.margins: 3 -- 2.22.0