Merge pull request mavlink#6048 from bluerobotics/formatting-fix

Fix NMEA settings layout
caijinxun · Jan 20, 2018 · 0cffebc · 0cffebc
2 parents 5a2a5dc + c61889d
commit 0cffebc
Showing 1 changed file with 18 additions and 10 deletions.
diff --git a/src/ui/preferences/GeneralSettings.qml b/src/ui/preferences/GeneralSettings.qml
@@ -491,20 +491,21 @@ QGCView {
                         }
 
                         Row {
-                            width:    parent.width
-                            spacing:  ScreenTools.defaultFontPixelWidth
-                            visible:  !ScreenTools.isMobile
-                                      && QGroundControl.settingsManager.autoConnectSettings.autoConnectNmeaPort.visible
-                                      && QGroundControl.settingsManager.autoConnectSettings.autoConnectNmeaBaud.visible
+                            anchors.horizontalCenter: parent.horizontalCenter
+                            spacing:                  ScreenTools.defaultFontPixelWidth
+                            visible:                  !ScreenTools.isMobile
+                                                      && QGroundControl.settingsManager.autoConnectSettings.autoConnectNmeaPort.visible
+                                                      && QGroundControl.settingsManager.autoConnectSettings.autoConnectNmeaBaud.visible
 
                             QGCLabel {
                                 anchors.baseline: nmeaPortCombo.baseline
-                                text: qsTr("NMEA GPS Device:")
+                                text:             qsTr("NMEA GPS Device:")
+                                width:            _labelWidth
                             }
 
                             QGCComboBox {
                                 id:     nmeaPortCombo
-                                width:  parent.width/3
+                                width:  _editFieldWidth
                                 model:  ListModel {
                                             ListElement { text: "disabled" }
                                         }
@@ -522,15 +523,22 @@ QGCView {
                                     nmeaPortCombo.currentIndex = index;
                                 }
                             }
-
+                        }
+                        Row {
+                            anchors.horizontalCenter: parent.horizontalCenter
+                            spacing:                  ScreenTools.defaultFontPixelWidth
+                            visible:                  !ScreenTools.isMobile
+                                                      && QGroundControl.settingsManager.autoConnectSettings.autoConnectNmeaPort.visible
+                                                      && QGroundControl.settingsManager.autoConnectSettings.autoConnectNmeaBaud.visible
                             QGCLabel {
                                 anchors.baseline: nmeaBaudCombo.baseline
-                                text: qsTr("NMEA GPS Baudrate:")
+                                text:             qsTr("NMEA GPS Baudrate:")
+                                width:            _labelWidth
                             }
 
                             QGCComboBox {
                                 id:     nmeaBaudCombo
-                                width:  parent.width/3
+                                width:  _editFieldWidth
                                 model:  [4800, 9600, 19200, 38400, 57600, 115200]
 
                                 onActivated: {