Browse Source

Small ui tweaks

Some things looked wrong in Outdoor mode and there
were some misalignments between labels and inputs
QGC4.4
Sam Gillam 3 years ago committed by Beat Küng
parent
commit
cb7ea2310c
  1. 2
      src/FlightMap/Widgets/PhotoVideoControl.qml
  2. 1
      src/QmlControls/QGCComboBox.qml
  3. 4
      src/ui/preferences/MavlinkSettings.qml

2
src/FlightMap/Widgets/PhotoVideoControl.qml

@ -25,7 +25,7 @@ import QGroundControl.FactControls 1.0 @@ -25,7 +25,7 @@ import QGroundControl.FactControls 1.0
Rectangle {
height: mainLayout.height + (_margins * 2)
color: "#80000000"
color: Qt.rgba(qgcPal.window.r, qgcPal.window.g, qgcPal.window.b, 0.5)
radius: _margins
visible: (_mavlinkCamera || _videoStreamAvailable || _simpleCameraAvailable) && multiVehiclePanelSelector.showSingleVehiclePanel

1
src/QmlControls/QGCComboBox.qml

@ -27,6 +27,7 @@ T.ComboBox { @@ -27,6 +27,7 @@ T.ComboBox {
contentItem.implicitWidth + leftPadding + rightPadding + padding)
implicitHeight: Math.max(background ? background.implicitHeight : 0,
Math.max(contentItem.implicitHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding)
baselineOffset: contentItem.y + text.baselineOffset
leftPadding: padding + (!control.mirrored || !indicator || !indicator.visible ? 0 : indicator.width + spacing)
rightPadding: padding + (control.mirrored || !indicator || !indicator.visible ? 0 : indicator.width)

4
src/ui/preferences/MavlinkSettings.qml

@ -624,8 +624,8 @@ Rectangle { @@ -624,8 +624,8 @@ Rectangle {
text: QGroundControl.mavlinkLogManager.feedback
enabled: !_disableDataPersistence
style: TextAreaStyle {
textColor: qgcPal.windowShade
backgroundColor: qgcPal.text
textColor: qgcPal.textFieldText
backgroundColor: qgcPal.textField
}
}
}

Loading…
Cancel
Save