Browse Source

Merge pull request #7863 from DonLakeFlyer/Toolbar

Fix toolbar button sizing
QGC4.4
Don Gagne 6 years ago committed by GitHub
parent
commit
601b8d09e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      src/QmlControls/QGCToolBarButton.qml

8
src/QmlControls/QGCToolBarButton.qml

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

Loading…
Cancel
Save