Merge pull request #7863 from DonLakeFlyer/Toolbar

Fix toolbar button sizing

src/QmlControls/QGCToolBarButton.qml

@@ -7,7 +7,6 @@
  *
  ****************************************************************************/
 
-
 import QtQuick          2.3
 import QtQuick.Controls 2.4
 
@@ -18,10 +17,14 @@ import QGroundControl.ScreenTools   1.0
 Button {
     id:                 button
     height:             ScreenTools.defaultFontPixelHeight * 3
+    leftPadding:        _horizontalMargin
+    rightPadding:       _horizontalMargin
     autoExclusive:      true
 
     property bool logo: false
 
+    property real _horizontalMargin: ScreenTools.defaultFontPixelWidth
+
     background: Rectangle {
         anchors.fill: parent
         color:  logo ? qgcPal.brandingPurple : (checked ? qgcPal.buttonHighlight : Qt.rgba(0,0,0,0))
@@ -29,8 +32,6 @@ Button {
 
     contentItem: Row {
         spacing:                ScreenTools.defaultFontPixelWidth
-        anchors.left:               button.left
-        anchors.leftMargin:         ScreenTools.defaultFontPixelWidth
         anchors.verticalCenter: button.verticalCenter
         QGCColoredImage {
             id:                     _icon
@@ -50,5 +51,4 @@ Button {
             anchors.verticalCenter: parent.verticalCenter
         }
     }
-
 }