Skip to content

Q
qgroundcontrol
Commit c31991e8 authored by Yasen's avatar Yasen
Browse files
Options

Mutli-vehicle layout fix 

* Move the Multi-vehicle UI next, not under, the indicators
* Remove the icon
parent 4b15d5bc
Show whitespace changes
Inline Side-by-side
Showing with 13 additions and 13 deletions
custom-example/res/Custom/Widgets/CustomVehicleButton.qml
View file @ c31991e8
...@@ -47,7 +47,7 @@ Button { ...@@ -47,7 +47,7 @@ Button {
background: Rectangle { background: Rectangle {
anchors.fill: parent anchors.fill: parent
color: button.checked ? qgcPal.buttonHighlight : qgcPal.button color: button.checked ? qgcPal.window : qgcPal.button
radius: ScreenTools.defaultFontPixelWidth * 0.5 radius: ScreenTools.defaultFontPixelWidth * 0.5
} }
...@@ -55,16 +55,16 @@ Button { ...@@ -55,16 +55,16 @@ Button {
spacing: ScreenTools.defaultFontPixelWidth spacing: ScreenTools.defaultFontPixelWidth
anchors.margins: ScreenTools.defaultFontPixelWidth anchors.margins: ScreenTools.defaultFontPixelWidth
anchors.verticalCenter: button.verticalCenter anchors.verticalCenter: button.verticalCenter
QGCColoredImage { // QGCColoredImage {
id: _icon // id: _icon
height: ScreenTools.defaultFontPixelHeight * 1.5 // height: ScreenTools.defaultFontPixelHeight * 1.5
width: height // width: height
sourceSize.height: parent.height // sourceSize.height: parent.height
fillMode: Image.PreserveAspectFit // fillMode: Image.PreserveAspectFit
color: button.checked ? qgcPal.buttonHighlightText : qgcPal.buttonText // color: button.checked ? qgcPal.buttonHighlightText : qgcPal.buttonText
source: "/qmlimages/PaperPlane.svg" // source: "/qmlimages/PaperPlane.svg"
anchors.verticalCenter: parent.verticalCenter // anchors.verticalCenter: parent.verticalCenter
} // }
Column { Column {
id: _infoCol id: _infoCol
spacing: ScreenTools.defaultFontPixelHeight * 0.25 spacing: ScreenTools.defaultFontPixelHeight * 0.25
......
custom-example/res/CustomFlyView.qml
View file @ c31991e8
...@@ -256,7 +256,7 @@ Item { ...@@ -256,7 +256,7 @@ Item {
width: vehicleStatusGrid.width + (ScreenTools.defaultFontPixelWidth * 3) width: vehicleStatusGrid.width + (ScreenTools.defaultFontPixelWidth * 3)
height: vehicleStatusGrid.height + (ScreenTools.defaultFontPixelHeight * 1.5) height: vehicleStatusGrid.height + (ScreenTools.defaultFontPixelHeight * 1.5)
radius: 2 radius: 2
anchors.bottom: multiVehicleSelector.visible ? multiVehicleSelector.top : parent.bottom anchors.bottom: parent.bottom
anchors.bottomMargin: ScreenTools.defaultFontPixelWidth anchors.bottomMargin: ScreenTools.defaultFontPixelWidth
anchors.right: attitudeIndicator.visible ? attitudeIndicator.left : parent.right anchors.right: attitudeIndicator.visible ? attitudeIndicator.left : parent.right
anchors.rightMargin: attitudeIndicator.visible ? -ScreenTools.defaultFontPixelWidth : ScreenTools.defaultFontPixelWidth anchors.rightMargin: attitudeIndicator.visible ? -ScreenTools.defaultFontPixelWidth : ScreenTools.defaultFontPixelWidth
...@@ -493,7 +493,7 @@ Item { ...@@ -493,7 +493,7 @@ Item {
spacing: ScreenTools.defaultFontPixelWidth spacing: ScreenTools.defaultFontPixelWidth
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.bottomMargin: ScreenTools.defaultFontPixelWidth * 1.5 anchors.bottomMargin: ScreenTools.defaultFontPixelWidth * 1.5
anchors.right: parent.right anchors.right: vehicleIndicator.left
anchors.rightMargin: ScreenTools.defaultFontPixelWidth anchors.rightMargin: ScreenTools.defaultFontPixelWidth
visible: QGroundControl.multiVehicleManager.vehicles.count > 1 visible: QGroundControl.multiVehicleManager.vehicles.count > 1
Repeater { Repeater {
......
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