Skip to content

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

Merge pull request #8753 from DonLakeFlyer/ToolbarVisuals 

Toolbar: Visual tweaks
parents 85aa5735 b37c3c9c
Show whitespace changes
Inline Side-by-side
Showing with 22 additions and 3 deletions
src/ui/toolbar/MainToolBar.qml
View file @ cbbf4322
...@@ -100,6 +100,13 @@ Item { ...@@ -100,6 +100,13 @@ Item {
onTriggered: viewButtonSelectRow.visible = false onTriggered: viewButtonSelectRow.visible = false
} }
Rectangle {
Layout.margins: ScreenTools.defaultFontPixelHeight / 2
Layout.fillHeight: true
width: 1
color: qgcPal.text
}
QGCToolBarButton { QGCToolBarButton {
id: settingsButton id: settingsButton
Layout.fillHeight: true Layout.fillHeight: true
...@@ -196,7 +203,7 @@ Item { ...@@ -196,7 +203,7 @@ Item {
} }
Rectangle { Rectangle {
id: separator id: separator1
anchors.margins: ScreenTools.defaultFontPixelHeight / 2 anchors.margins: ScreenTools.defaultFontPixelHeight / 2
anchors.top: parent.top anchors.top: parent.top
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
...@@ -208,7 +215,7 @@ Item { ...@@ -208,7 +215,7 @@ Item {
QGCFlickable { QGCFlickable {
id: toolsFlickable id: toolsFlickable
anchors.leftMargin: ScreenTools.defaultFontPixelHeight / 2 anchors.leftMargin: ScreenTools.defaultFontPixelHeight / 2
anchors.left: separator.right anchors.left: separator1.right
anchors.bottomMargin: 1 anchors.bottomMargin: 1
anchors.top: parent.top anchors.top: parent.top
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
...@@ -231,9 +238,21 @@ Item { ...@@ -231,9 +238,21 @@ Item {
} }
} }
Rectangle {
id: separator2
anchors.margins: ScreenTools.defaultFontPixelHeight / 2
anchors.bottomMargin: ScreenTools.defaultFontPixelHeight / 2 - 1
anchors.top: parent.top
anchors.bottom: parent.bottom
anchors.left: valueArea.right
width: 1
color: qgcPal.text
}
Loader { Loader {
id: indicatorLoader id: indicatorLoader
anchors.left: valueArea.right anchors.leftMargin: ScreenTools.defaultFontPixelHeight / 2
anchors.left: separator2.right
anchors.top: parent.top anchors.top: parent.top
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
source: "qrc:/toolbar/MainToolBarIndicators.qml" source: "qrc:/toolbar/MainToolBarIndicators.qml"
......
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