Skip to content

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

Merge pull request #7863 from DonLakeFlyer/Toolbar 

Fix toolbar button sizing
parents 0b59ebe2 51224a13
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
src/QmlControls/QGCToolBarButton.qml
View file @ 601b8d09
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
* *
****************************************************************************/ ****************************************************************************/
import QtQuick 2.3 import QtQuick 2.3
import QtQuick.Controls 2.4 import QtQuick.Controls 2.4
...@@ -18,20 +17,22 @@ import QGroundControl.ScreenTools 1.0 ...@@ -18,20 +17,22 @@ 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))
} }
contentItem: Row { contentItem: Row {
spacing: ScreenTools.defaultFontPixelWidth spacing: ScreenTools.defaultFontPixelWidth
anchors.left: button.left anchors.verticalCenter: button.verticalCenter
anchors.leftMargin: ScreenTools.defaultFontPixelWidth
anchors.verticalCenter: button.verticalCenter
QGCColoredImage { QGCColoredImage {
id: _icon id: _icon
height: ScreenTools.defaultFontPixelHeight * 2 height: ScreenTools.defaultFontPixelHeight * 2
...@@ -50,5 +51,4 @@ Button { ...@@ -50,5 +51,4 @@ Button {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
} }
} }
} }
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