Merge pull request #7643 from yasendimov/pr_custom-theme-fixes

Custom theme - Multi vehicle and Camera Shutter fixes

custom-example/res/Custom/Widgets/CustomVehicleButton.qml

@@ -47,7 +47,7 @@ Button {
 
     background: Rectangle {
         anchors.fill:               parent
-        color:                      button.checked ? qgcPal.buttonHighlight : qgcPal.button
+        color:                      button.checked ? qgcPal.window : qgcPal.button
         radius:                     ScreenTools.defaultFontPixelWidth * 0.5
     }
 
@@ -55,16 +55,16 @@ Button {
         spacing:                    ScreenTools.defaultFontPixelWidth
         anchors.margins:            ScreenTools.defaultFontPixelWidth
         anchors.verticalCenter:     button.verticalCenter
-        QGCColoredImage {
-            id:                     _icon
-            height:                 ScreenTools.defaultFontPixelHeight * 1.5
-            width:                  height
-            sourceSize.height:      parent.height
-            fillMode:               Image.PreserveAspectFit
-            color:                  button.checked ? qgcPal.buttonHighlightText : qgcPal.buttonText
-            source:                 "/qmlimages/PaperPlane.svg"
-            anchors.verticalCenter: parent.verticalCenter
-        }
+//        QGCColoredImage {
+//            id:                     _icon
+//            height:                 ScreenTools.defaultFontPixelHeight * 1.5
+//            width:                  height
+//            sourceSize.height:      parent.height
+//            fillMode:               Image.PreserveAspectFit
+//            color:                  button.checked ? qgcPal.buttonHighlightText : qgcPal.buttonText
+//            source:                 "/qmlimages/PaperPlane.svg"
+//            anchors.verticalCenter: parent.verticalCenter
+//        }
         Column {
             id:                     _infoCol
             spacing:                ScreenTools.defaultFontPixelHeight * 0.25

custom-example/res/CustomCameraControl.qml

@@ -232,10 +232,10 @@ Item {
                         height:                 ScreenTools.defaultFontPixelHeight * 4
                         radius:                 width * 0.5
                         border.color:           qgcPal.buttonText
-                        border.width:           2
+                        border.width:           1
                         anchors.horizontalCenter: parent.horizontalCenter
                         Rectangle {
-                            width:              parent.width * 0.95
+                            width:              parent.width * 0.85
                             height:             width
                             radius:             width * 0.5
                             color:              _cameraModeUndefined ? qgcPal.colorGrey : ( _cameraVideoMode ? qgcPal.colorRed : qgcPal.text )

custom-example/res/CustomFlyView.qml

@@ -256,7 +256,7 @@ Item {
         width:                  vehicleStatusGrid.width  + (ScreenTools.defaultFontPixelWidth  * 3)
         height:                 vehicleStatusGrid.height + (ScreenTools.defaultFontPixelHeight * 1.5)
         radius:                 2
-        anchors.bottom:         multiVehicleSelector.visible ? multiVehicleSelector.top : parent.bottom
+        anchors.bottom:         parent.bottom
         anchors.bottomMargin:   ScreenTools.defaultFontPixelWidth
         anchors.right:          attitudeIndicator.visible ? attitudeIndicator.left : parent.right
         anchors.rightMargin:    attitudeIndicator.visible ? -ScreenTools.defaultFontPixelWidth : ScreenTools.defaultFontPixelWidth
@@ -493,7 +493,7 @@ Item {
         spacing:                ScreenTools.defaultFontPixelWidth
         anchors.bottom:         parent.bottom
         anchors.bottomMargin:   ScreenTools.defaultFontPixelWidth * 1.5
-        anchors.right:          parent.right
+        anchors.right:          vehicleIndicator.left
         anchors.rightMargin:    ScreenTools.defaultFontPixelWidth
         visible:                QGroundControl.multiVehicleManager.vehicles.count > 1
         Repeater {