Merge branch 'Stable_V3.3' of https://github.com/mavlink/qgroundcontrol into StableMerge

src/PlanView/SurveyItemEditor.qml

@@ -440,12 +440,23 @@ Rectangle {
                         Layout.fillWidth:   true
                     }
 
-                    ToolButton {
+                    Rectangle {
                         id:         windRoseButton
-                        anchors.verticalCenter: angleText.verticalCenter
+                        width:      ScreenTools.implicitTextFieldHeight
-                        iconSource:             qgcPal.globalTheme === QGCPalette.Light ? "/res/wind-roseBlack.svg" : "/res/wind-rose.svg"
+                        height:     width
+                        color:      qgcPal.button
                         visible:    _vehicle ? _vehicle.fixedWing : false
 
+                        QGCColoredImage {
+                            anchors.fill:   parent
+                            source:         "/res/wind-rose.svg"
+                            smooth:         true
+                            color:          qgcPal.buttonText
+                        }
+
+                        QGCMouseArea {
+                            fillItem: parent
+
                             onClicked: {
                                 windRosePie.angle = Number(gridAngleText.text)
                                 var cords = windRoseButton.mapToItem(_root, 0, 0)
@@ -453,6 +464,7 @@ Rectangle {
                             }
                         }
                     }
+                }
 
                 FactTextField {
                     id:                 gridAngleText
@@ -543,19 +555,31 @@ Rectangle {
                     Layout.fillWidth:  true
                 }
 
-                ToolButton {
+                Rectangle {
                     id:         manualWindRoseButton
-                    anchors.verticalCenter: manualAngleText.verticalCenter
+                    width:      ScreenTools.implicitTextFieldHeight
-                    Layout.columnSpan:      1
+                    height:     width
-                    iconSource:             qgcPal.globalTheme === QGCPalette.Light ? "/res/wind-roseBlack.svg" : "/res/wind-rose.svg"
+                    color:      qgcPal.button
                     visible:    _vehicle ? _vehicle.fixedWing : false
 
+                    QGCColoredImage {
+                        anchors.fill:   parent
+                        source:         "/res/wind-rose.svg"
+                        smooth:         true
+                        color:          qgcPal.buttonText
+                    }
+
+                    QGCMouseArea {
+                        fillItem: parent
+
                         onClicked: {
+                            windRosePie.angle = Number(gridAngleText.text)
                             var cords = manualWindRoseButton.mapToItem(_root, 0, 0)
                             windRosePie.popup(cords.x + manualWindRoseButton.width / 2, cords.y + manualWindRoseButton.height / 2)
                         }
                     }
                 }
+            }
 
             FactTextField {
                 id:                 manualGridAngleText