Skip to content

Q
qgroundcontrol
Unverified Commit ef519e92 authored by Don Gagne's avatar Don Gagne Committed by GitHub
Browse files
Options

Merge pull request #6627 from DonLakeFlyer/ComboSize 

Fix combo width sizing
parents d4822bed f77cab5e
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 8 deletions
src/AutoPilotPlugins/APM/APMPowerComponent.qml
View file @ ef519e92
...@@ -214,10 +214,9 @@ SetupPage { ...@@ -214,10 +214,9 @@ SetupPage {
QGCLabel { text: qsTr("Battery monitor:") } QGCLabel { text: qsTr("Battery monitor:") }
FactComboBox { FactComboBox {
id: monitorCombo id: monitorCombo
Layout.minimumWidth: _fieldWidth fact: battMonitor
fact: battMonitor indexModel: false
indexModel: false
} }
QGCLabel { QGCLabel {
......
src/QmlControls/QGCComboBox.qml
View file @ ef519e92
...@@ -21,6 +21,8 @@ Button { ...@@ -21,6 +21,8 @@ Button {
property var _qgcPal: QGCPalette { colorGroupEnabled: enabled } property var _qgcPal: QGCPalette { colorGroupEnabled: enabled }
property int _horizontalPadding: ScreenTools.defaultFontPixelWidth property int _horizontalPadding: ScreenTools.defaultFontPixelWidth
property int _verticalPadding: Math.round(ScreenTools.defaultFontPixelHeight / 2) property int _verticalPadding: Math.round(ScreenTools.defaultFontPixelHeight / 2)
property real _dropImageWidth: ScreenTools.defaultFontPixelHeight / 2
property real _dropImageMargin: _dropImageWidth / 2
property var __popup: popup property var __popup: popup
signal activated(int index) signal activated(int index)
...@@ -44,10 +46,10 @@ Button { ...@@ -44,10 +46,10 @@ Button {
QGCColoredImage { QGCColoredImage {
id: image id: image
width: ScreenTools.defaultFontPixelHeight / 2 width: _dropImageWidth
height: width height: _dropImageWidth
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.rightMargin: width / 2 anchors.rightMargin: _dropImageMargin
anchors.right: parent.right anchors.right: parent.right
source: "/qmlimages/arrow-down.png" source: "/qmlimages/arrow-down.png"
color: control._qgcPal.buttonText color: control._qgcPal.buttonText
...@@ -56,7 +58,7 @@ Button { ...@@ -56,7 +58,7 @@ Button {
/*! This defines the label of the button. */ /*! This defines the label of the button. */
label: Item { label: Item {
implicitWidth: text.implicitWidth implicitWidth: text.implicitWidth + _dropImageWidth
implicitHeight: text.implicitHeight implicitHeight: text.implicitHeight
baselineOffset: text.y + text.baselineOffset baselineOffset: text.y + text.baselineOffset
......
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