Browse Source

Grrr.. Mistyped it.

QGC4.4
dogmaphobic 10 years ago
parent
commit
5cf65f9fe1
  1. 6
      src/QmlControls/QGCButton.qml
  2. 2
      src/QmlControls/QGCToolBarButton.qml

6
src/QmlControls/QGCButton.qml

@ -12,7 +12,7 @@ Button {
property var __qgcPal: QGCPalette { colorGroupEnabled: enabled } 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 // 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 // move the mouse fast enough such that the MouseArea does not trigger an onExited. This is turn
@ -70,7 +70,7 @@ Button {
Rectangle { Rectangle {
anchors.fill: parent anchors.fill: parent
color: __showHighLight ? color: __showHighlight ?
control.__qgcPal.buttonHighlight : control.__qgcPal.buttonHighlight :
(primary ? control.__qgcPal.primaryButton : control.__qgcPal.button) (primary ? control.__qgcPal.primaryButton : control.__qgcPal.button)
} }
@ -107,7 +107,7 @@ Button {
renderType: Text.NativeRendering renderType: Text.NativeRendering
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
text: control.text text: control.text
color: __showHighLight ? color: __showHighlight ?
control.__qgcPal.buttonHighlightText : control.__qgcPal.buttonHighlightText :
(primary ? control.__qgcPal.primaryButtonText : control.__qgcPal.buttonText) (primary ? control.__qgcPal.primaryButtonText : control.__qgcPal.buttonText)
} }

2
src/QmlControls/QGCToolBarButton.qml

@ -10,7 +10,7 @@ QGCButton {
id: button id: button
property bool repaintChevron: false property bool repaintChevron: false
property var __qgcPal: QGCPalette { colorGroupEnabled: enabled } property var __qgcPal: QGCPalette { colorGroupEnabled: enabled }
property bool showHighlight: __showHighLight property bool showHighlight: __showHighlight
style: ButtonStyle { style: ButtonStyle {
background: Item { background: Item {
anchors.margins: 3 anchors.margins: 3

Loading…
Cancel
Save